diff --git a/ifrs17-template/Test/Data/ExportReportVariables.ipynb b/ifrs17-template/Test/Data/ExportReportVariables.ipynb
index 187ffd73..3a365b26 100644
--- a/ifrs17-template/Test/Data/ExportReportVariables.ipynb
+++ b/ifrs17-template/Test/Data/ExportReportVariables.ipynb
@@ -82,7 +82,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var reportStorage = new ReportStorage(Workspace, Report);",
+                "var reportStorage = new ReportStorage(Workspace, Report, Export);",
                 "\nawait reportStorage.InitializeReportIndependentCacheAsync();"
             ],
             "metadata": {},
@@ -98,15 +98,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "//var path = \"./Data/ReportVariableBenchmarks/\";"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
@@ -139,6 +130,7 @@
             "source": [
                 "((int Year, int Month) Period, string ReportingNode, string Scenario, CurrencyType CurrencyType)[] exportScope = {",
                 "\n    ((2020, 12), \"CH\", null, CurrencyType.Contractual),",
+                "\n    ((2020, 12), \"CH\", \"MTUP10pct\", CurrencyType.Contractual),",
                 "\n    ((2020, 12), \"CH\", null, CurrencyType.Functional),",
                 "\n    ((2020, 12), \"CH\", null, CurrencyType.Group),  ",
                 "\n    ((2021,  3), \"CH\", null, CurrencyType.Contractual),",
@@ -162,7 +154,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var args = exportScope[0];",
+                "var args = exportScope[2];",
                 "\nargs"
             ],
             "metadata": {},
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_BE.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_BE.csv
index 9cf2e533..0a47ce2b 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_BE.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_BE.csv
@@ -25,47 +25,43 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,EOP,DT1.2,N,BE,C,330
 2020,NIC,BOP,DT1.2,N,BE,N,660
 2020,NIC,CF,DT1.2,N,BE,N,-330
-,CDR,EOP,DTR1.1,C,BE,C,0.1268
-,CDR,BOP,DTR1.1,C,BE,N,0.52925
-,CDR,CF,DTR1.1,C,BE,N,-0.40374
-,CDR,IA,DTR1.1,C,BE,N,0.00129
+,CDR,EOP,DTR1.1,C,BE,C,0.01057
+,CDR,BOP,DTR1.1,C,BE,N,0.04415
+,CDR,CF,DTR1.1,C,BE,N,-0.03368
 ,NIC,EOP,DTR1.1,C,BE,C,-164.82155
 ,NIC,BOP,DTR1.1,C,BE,N,-329.31412
 ,NIC,CF,DTR1.1,C,BE,N,165
 ,NIC,IA,DTR1.1,C,BE,N,-0.50743
-,CDR,EOP,DTR1.1,L,BE,C,0.1268
-,CDR,BOP,DTR1.1,L,BE,N,0.52925
-,CDR,CF,DTR1.1,L,BE,N,-0.40374
-,CDR,IA,DTR1.1,L,BE,N,0.00129
+,CDR,EOP,DTR1.1,L,BE,C,0.01057
+,CDR,BOP,DTR1.1,L,BE,N,0.04415
+,CDR,CF,DTR1.1,L,BE,N,-0.03368
 ,NIC,EOP,DTR1.1,L,BE,C,-164.82155
 ,NIC,BOP,DTR1.1,L,BE,N,-329.31412
 ,NIC,CF,DTR1.1,L,BE,N,165
 ,NIC,IA,DTR1.1,L,BE,N,-0.50743
-,CDR,EOP,DTR1.1,N,BE,C,0.12698
-,CDR,BOP,DTR1.1,N,BE,N,0.53072
-,CDR,CF,DTR1.1,N,BE,N,-0.40374
+,CDR,EOP,DTR1.1,N,BE,C,0.01059
+,CDR,BOP,DTR1.1,N,BE,N,0.04427
+,CDR,CF,DTR1.1,N,BE,N,-0.03368
 ,NIC,EOP,DTR1.1,N,BE,C,-165
 ,NIC,BOP,DTR1.1,N,BE,N,-330
 ,NIC,CF,DTR1.1,N,BE,N,165
-2020,CDR,EOP,DTR1.2,C,BE,C,0.1268
-2020,CDR,BOP,DTR1.2,C,BE,N,0.52925
-2020,CDR,CF,DTR1.2,C,BE,N,-0.40374
-2020,CDR,IA,DTR1.2,C,BE,N,0.00129
+2020,CDR,EOP,DTR1.2,C,BE,C,0.01057
+2020,CDR,BOP,DTR1.2,C,BE,N,0.04415
+2020,CDR,CF,DTR1.2,C,BE,N,-0.03368
 2020,NIC,EOP,DTR1.2,C,BE,C,-164.82155
 2020,NIC,BOP,DTR1.2,C,BE,N,-329.31412
 2020,NIC,CF,DTR1.2,C,BE,N,165
 2020,NIC,IA,DTR1.2,C,BE,N,-0.50743
-2020,CDR,EOP,DTR1.2,L,BE,C,0.1268
-2020,CDR,BOP,DTR1.2,L,BE,N,0.52925
-2020,CDR,CF,DTR1.2,L,BE,N,-0.40374
-2020,CDR,IA,DTR1.2,L,BE,N,0.00129
+2020,CDR,EOP,DTR1.2,L,BE,C,0.01057
+2020,CDR,BOP,DTR1.2,L,BE,N,0.04415
+2020,CDR,CF,DTR1.2,L,BE,N,-0.03368
 2020,NIC,EOP,DTR1.2,L,BE,C,-164.82155
 2020,NIC,BOP,DTR1.2,L,BE,N,-329.31412
 2020,NIC,CF,DTR1.2,L,BE,N,165
 2020,NIC,IA,DTR1.2,L,BE,N,-0.50743
-2020,CDR,EOP,DTR1.2,N,BE,C,0.12698
-2020,CDR,BOP,DTR1.2,N,BE,N,0.53072
-2020,CDR,CF,DTR1.2,N,BE,N,-0.40374
+2020,CDR,EOP,DTR1.2,N,BE,C,0.01059
+2020,CDR,BOP,DTR1.2,N,BE,N,0.04427
+2020,CDR,CF,DTR1.2,N,BE,N,-0.03368
 2020,NIC,EOP,DTR1.2,N,BE,C,-165
 2020,NIC,BOP,DTR1.2,N,BE,N,-330
 2020,NIC,CF,DTR1.2,N,BE,N,165
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_C.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_C.csv
index b9f6ed7f..7eba4526 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_C.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_C.csv
@@ -7,9 +7,7 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,,EOP,DT1.1,,C,C,22.35306
 ,,BOP,DT1.1,,C,N,80.0332
 ,,IA,DT1.1,,C,N,-0.00993
-,,AM,DTR1.1,,C,C,26.60498
-,,EOP,DTR1.1,,C,C,-13.93719
-,,BOP,DTR1.1,,C,N,-40.54585
-,,IA,DTR1.1,,C,N,0.0036888043
-,,BOP,DTR1.1,,C,N,-40.545846351508814
-,,IA,DTR1.1,,C,N,0.003676678453477744
\ No newline at end of file
+,,AM,DTR1.1,,C,C,26.28586
+,,EOP,DTR1.1,,C,C,-13.77001
+,,BOP,DTR1.1,,C,N,-40.06074
+,,IA,DTR1.1,,C,N,0.00487
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BE.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BE.csv
index bcbd63c9..4de8e423 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BE.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BE.csv
@@ -195,10 +195,10 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DT5.1,L,BE,N,-798.53673
 ,PR,CF,DT5.1,L,BE,N,400
 ,PR,IA,DT5.1,L,BE,N,-1.0972
-,CDR,EOP,DTR1.1,C,BE,C,0.11527
-,CDR,BOP,DTR1.1,C,BE,N,0.48113
-,CDR,CF,DTR1.1,C,BE,N,-0.36703
-,CDR,IA,DTR1.1,C,BE,N,0.00117
+,CDR,EOP,DTR1.1,C,BE,C,0.00961
+,CDR,BOP,DTR1.1,C,BE,N,0.04013
+,CDR,CF,DTR1.1,C,BE,N,-0.03062
+,CDR,IA,DTR1.1,C,BE,N,0.0001
 ,NIC,EOP,DTR1.1,C,BE,C,-149.83777
 ,NIC,BOP,DTR1.1,C,BE,N,-299.37647
 ,NIC,CF,DTR1.1,C,BE,N,150
@@ -207,10 +207,10 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.1,C,BE,N,399.26837
 ,PR,CF,DTR1.1,C,BE,N,-200
 ,PR,IA,DTR1.1,C,BE,N,0.5486
-,CDR,EOP,DTR1.1,L,BE,C,0.11527
-,CDR,BOP,DTR1.1,L,BE,N,0.48113
-,CDR,CF,DTR1.1,L,BE,N,-0.36703
-,CDR,IA,DTR1.1,L,BE,N,0.00117
+,CDR,EOP,DTR1.1,L,BE,C,0.00961
+,CDR,BOP,DTR1.1,L,BE,N,0.04013
+,CDR,CF,DTR1.1,L,BE,N,-0.03062
+,CDR,IA,DTR1.1,L,BE,N,0.0001
 ,NIC,EOP,DTR1.1,L,BE,C,-149.83777
 ,NIC,BOP,DTR1.1,L,BE,N,-299.37647
 ,NIC,CF,DTR1.1,L,BE,N,150
@@ -219,41 +219,41 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.1,L,BE,N,399.26837
 ,PR,CF,DTR1.1,L,BE,N,-200
 ,PR,IA,DTR1.1,L,BE,N,0.5486
-,CDR,EOP,DTR1.1,N,BE,C,0.11544
-,CDR,BOP,DTR1.1,N,BE,N,0.48247
-,CDR,CF,DTR1.1,N,BE,N,-0.36703
+,CDR,EOP,DTR1.1,N,BE,C,0.00962
+,CDR,BOP,DTR1.1,N,BE,N,0.04024
+,CDR,CF,DTR1.1,N,BE,N,-0.03062
 ,NIC,EOP,DTR1.1,N,BE,C,-150
 ,NIC,BOP,DTR1.1,N,BE,N,-300
 ,NIC,CF,DTR1.1,N,BE,N,150
 ,PR,EOP,DTR1.1,N,BE,C,200
 ,PR,BOP,DTR1.1,N,BE,N,400
 ,PR,CF,DTR1.1,N,BE,N,-200
-2020,CDR,EOP,DTR1.2,C,BE,C,0.11527
-2020,CDR,BOP,DTR1.2,C,BE,N,0.48113
-2020,CDR,CF,DTR1.2,C,BE,N,-0.36703
-2020,CDR,IA,DTR1.2,C,BE,N,0.00117
+2020,CDR,EOP,DTR1.2,C,BE,C,0.00961
+2020,CDR,BOP,DTR1.2,C,BE,N,0.04013
+2020,CDR,CF,DTR1.2,C,BE,N,-0.03062
+2020,CDR,IA,DTR1.2,C,BE,N,0.0001
 2020,NIC,EOP,DTR1.2,C,BE,C,-149.83777
 2020,NIC,BOP,DTR1.2,C,BE,N,-299.37647
 2020,NIC,CF,DTR1.2,C,BE,N,150
 2020,NIC,IA,DTR1.2,C,BE,N,-0.4613
-2020,CDR,EOP,DTR1.2,L,BE,C,0.11527
-2020,CDR,BOP,DTR1.2,L,BE,N,0.48113
-2020,CDR,CF,DTR1.2,L,BE,N,-0.36703
-2020,CDR,IA,DTR1.2,L,BE,N,0.00117
+2020,CDR,EOP,DTR1.2,L,BE,C,0.00961
+2020,CDR,BOP,DTR1.2,L,BE,N,0.04013
+2020,CDR,CF,DTR1.2,L,BE,N,-0.03062
+2020,CDR,IA,DTR1.2,L,BE,N,0.0001
 2020,NIC,EOP,DTR1.2,L,BE,C,-149.83777
 2020,NIC,BOP,DTR1.2,L,BE,N,-299.37647
 2020,NIC,CF,DTR1.2,L,BE,N,150
 2020,NIC,IA,DTR1.2,L,BE,N,-0.4613
-2020,CDR,EOP,DTR1.2,N,BE,C,0.11544
-2020,CDR,BOP,DTR1.2,N,BE,N,0.48247
-2020,CDR,CF,DTR1.2,N,BE,N,-0.36703
+2020,CDR,EOP,DTR1.2,N,BE,C,0.00962
+2020,CDR,BOP,DTR1.2,N,BE,N,0.04024
+2020,CDR,CF,DTR1.2,N,BE,N,-0.03062
 2020,NIC,EOP,DTR1.2,N,BE,C,-150
 2020,NIC,BOP,DTR1.2,N,BE,N,-300
 2020,NIC,CF,DTR1.2,N,BE,N,150
-,CDR,EOP,DTR1.3,C,BE,C,0.11527
-,CDR,BOP,DTR1.3,C,BE,N,0.48113
-,CDR,CF,DTR1.3,C,BE,N,-0.36703
-,CDR,IA,DTR1.3,C,BE,N,0.00117
+,CDR,EOP,DTR1.3,C,BE,C,0.00961
+,CDR,BOP,DTR1.3,C,BE,N,0.04013
+,CDR,CF,DTR1.3,C,BE,N,-0.03062
+,CDR,IA,DTR1.3,C,BE,N,0.0001
 ,NIC,EOP,DTR1.3,C,BE,C,-149.83777
 ,NIC,BOP,DTR1.3,C,BE,N,-299.37647
 ,NIC,CF,DTR1.3,C,BE,N,150
@@ -262,10 +262,10 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.3,C,BE,N,399.26837
 ,PR,CF,DTR1.3,C,BE,N,-200
 ,PR,IA,DTR1.3,C,BE,N,0.5486
-,CDR,EOP,DTR1.3,L,BE,C,0.11527
-,CDR,BOP,DTR1.3,L,BE,N,0.48113
-,CDR,CF,DTR1.3,L,BE,N,-0.36703
-,CDR,IA,DTR1.3,L,BE,N,0.00117
+,CDR,EOP,DTR1.3,L,BE,C,0.00961
+,CDR,BOP,DTR1.3,L,BE,N,0.04013
+,CDR,CF,DTR1.3,L,BE,N,-0.03062
+,CDR,IA,DTR1.3,L,BE,N,0.0001
 ,NIC,EOP,DTR1.3,L,BE,C,-149.83777
 ,NIC,BOP,DTR1.3,L,BE,N,-299.37647
 ,NIC,CF,DTR1.3,L,BE,N,150
@@ -274,19 +274,19 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.3,L,BE,N,399.26837
 ,PR,CF,DTR1.3,L,BE,N,-200
 ,PR,IA,DTR1.3,L,BE,N,0.5486
-,CDR,EOP,DTR1.3,N,BE,C,0.11544
-,CDR,BOP,DTR1.3,N,BE,N,0.48247
-,CDR,CF,DTR1.3,N,BE,N,-0.36703
+,CDR,EOP,DTR1.3,N,BE,C,0.00962
+,CDR,BOP,DTR1.3,N,BE,N,0.04024
+,CDR,CF,DTR1.3,N,BE,N,-0.03062
 ,NIC,EOP,DTR1.3,N,BE,C,-150
 ,NIC,BOP,DTR1.3,N,BE,N,-300
 ,NIC,CF,DTR1.3,N,BE,N,150
 ,PR,EOP,DTR1.3,N,BE,C,200
 ,PR,BOP,DTR1.3,N,BE,N,400
 ,PR,CF,DTR1.3,N,BE,N,-200
-,CDR,EOP,DTR1.4,C,BE,C,0.11527
-,CDR,BOP,DTR1.4,C,BE,N,0.48113
-,CDR,CF,DTR1.4,C,BE,N,-0.36703
-,CDR,IA,DTR1.4,C,BE,N,0.00117
+,CDR,EOP,DTR1.4,C,BE,C,0.00961
+,CDR,BOP,DTR1.4,C,BE,N,0.04013
+,CDR,CF,DTR1.4,C,BE,N,-0.03062
+,CDR,IA,DTR1.4,C,BE,N,0.0001
 ,NIC,EOP,DTR1.4,C,BE,C,-149.83777
 ,NIC,BOP,DTR1.4,C,BE,N,-299.37647
 ,NIC,CF,DTR1.4,C,BE,N,150
@@ -295,10 +295,10 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.4,C,BE,N,399.26837
 ,PR,CF,DTR1.4,C,BE,N,-200
 ,PR,IA,DTR1.4,C,BE,N,0.5486
-,CDR,EOP,DTR1.4,L,BE,C,0.11527
-,CDR,BOP,DTR1.4,L,BE,N,0.48113
-,CDR,CF,DTR1.4,L,BE,N,-0.36703
-,CDR,IA,DTR1.4,L,BE,N,0.00117
+,CDR,EOP,DTR1.4,L,BE,C,0.00961
+,CDR,BOP,DTR1.4,L,BE,N,0.04013
+,CDR,CF,DTR1.4,L,BE,N,-0.03062
+,CDR,IA,DTR1.4,L,BE,N,0.0001
 ,NIC,EOP,DTR1.4,L,BE,C,-149.83777
 ,NIC,BOP,DTR1.4,L,BE,N,-299.37647
 ,NIC,CF,DTR1.4,L,BE,N,150
@@ -307,19 +307,19 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.4,L,BE,N,399.26837
 ,PR,CF,DTR1.4,L,BE,N,-200
 ,PR,IA,DTR1.4,L,BE,N,0.5486
-,CDR,EOP,DTR1.4,N,BE,C,0.11544
-,CDR,BOP,DTR1.4,N,BE,N,0.48247
-,CDR,CF,DTR1.4,N,BE,N,-0.36703
+,CDR,EOP,DTR1.4,N,BE,C,0.00962
+,CDR,BOP,DTR1.4,N,BE,N,0.04024
+,CDR,CF,DTR1.4,N,BE,N,-0.03062
 ,NIC,EOP,DTR1.4,N,BE,C,-150
 ,NIC,BOP,DTR1.4,N,BE,N,-300
 ,NIC,CF,DTR1.4,N,BE,N,150
 ,PR,EOP,DTR1.4,N,BE,C,200
 ,PR,BOP,DTR1.4,N,BE,N,400
 ,PR,CF,DTR1.4,N,BE,N,-200
-,CDR,EOP,DTR2.1,C,BE,C,0.11527
-,CDR,BOP,DTR2.1,C,BE,N,0.48113
-,CDR,CF,DTR2.1,C,BE,N,-0.36703
-,CDR,IA,DTR2.1,C,BE,N,0.00117
+,CDR,EOP,DTR2.1,C,BE,C,0.00961
+,CDR,BOP,DTR2.1,C,BE,N,0.04013
+,CDR,CF,DTR2.1,C,BE,N,-0.03062
+,CDR,IA,DTR2.1,C,BE,N,0.0001
 ,NIC,EOP,DTR2.1,C,BE,C,-149.83777
 ,NIC,BOP,DTR2.1,C,BE,N,-299.37647
 ,NIC,CF,DTR2.1,C,BE,N,150
@@ -328,10 +328,10 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR2.1,C,BE,N,399.26837
 ,PR,CF,DTR2.1,C,BE,N,-200
 ,PR,IA,DTR2.1,C,BE,N,0.5486
-,CDR,EOP,DTR2.1,L,BE,C,0.11527
-,CDR,BOP,DTR2.1,L,BE,N,0.48113
-,CDR,CF,DTR2.1,L,BE,N,-0.36703
-,CDR,IA,DTR2.1,L,BE,N,0.00117
+,CDR,EOP,DTR2.1,L,BE,C,0.00961
+,CDR,BOP,DTR2.1,L,BE,N,0.04013
+,CDR,CF,DTR2.1,L,BE,N,-0.03062
+,CDR,IA,DTR2.1,L,BE,N,0.0001
 ,NIC,EOP,DTR2.1,L,BE,C,-149.83777
 ,NIC,BOP,DTR2.1,L,BE,N,-299.37647
 ,NIC,CF,DTR2.1,L,BE,N,150
@@ -340,34 +340,34 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR2.1,L,BE,N,399.26837
 ,PR,CF,DTR2.1,L,BE,N,-200
 ,PR,IA,DTR2.1,L,BE,N,0.5486
-,CDR,EOP,DTR2.1,N,BE,C,0.11544
-,CDR,BOP,DTR2.1,N,BE,N,0.48247
-,CDR,CF,DTR2.1,N,BE,N,-0.36703
+,CDR,EOP,DTR2.1,N,BE,C,0.00962
+,CDR,BOP,DTR2.1,N,BE,N,0.04024
+,CDR,CF,DTR2.1,N,BE,N,-0.03062
 ,NIC,EOP,DTR2.1,N,BE,C,-150
 ,NIC,BOP,DTR2.1,N,BE,N,-300
 ,NIC,CF,DTR2.1,N,BE,N,150
 ,PR,EOP,DTR2.1,N,BE,C,200
 ,PR,BOP,DTR2.1,N,BE,N,400
 ,PR,CF,DTR2.1,N,BE,N,-200
-2020,CDR,EOP,DTR2.2,C,BE,C,0.11527
-2020,CDR,BOP,DTR2.2,C,BE,N,0.48113
-2020,CDR,CF,DTR2.2,C,BE,N,-0.36703
-2020,CDR,IA,DTR2.2,C,BE,N,0.00117
+2020,CDR,EOP,DTR2.2,C,BE,C,0.00961
+2020,CDR,BOP,DTR2.2,C,BE,N,0.04013
+2020,CDR,CF,DTR2.2,C,BE,N,-0.03062
+2020,CDR,IA,DTR2.2,C,BE,N,0.0001
 2020,NIC,EOP,DTR2.2,C,BE,C,-149.83777
 2020,NIC,BOP,DTR2.2,C,BE,N,-299.37647
 2020,NIC,CF,DTR2.2,C,BE,N,150
 2020,NIC,IA,DTR2.2,C,BE,N,-0.4613
-2020,CDR,EOP,DTR2.2,L,BE,C,0.11527
-2020,CDR,BOP,DTR2.2,L,BE,N,0.48113
-2020,CDR,CF,DTR2.2,L,BE,N,-0.36703
-2020,CDR,IA,DTR2.2,L,BE,N,0.00117
+2020,CDR,EOP,DTR2.2,L,BE,C,0.00961
+2020,CDR,BOP,DTR2.2,L,BE,N,0.04013
+2020,CDR,CF,DTR2.2,L,BE,N,-0.03062
+2020,CDR,IA,DTR2.2,L,BE,N,0.0001
 2020,NIC,EOP,DTR2.2,L,BE,C,-149.83777
 2020,NIC,BOP,DTR2.2,L,BE,N,-299.37647
 2020,NIC,CF,DTR2.2,L,BE,N,150
 2020,NIC,IA,DTR2.2,L,BE,N,-0.4613
-2020,CDR,EOP,DTR2.2,N,BE,C,0.11544
-2020,CDR,BOP,DTR2.2,N,BE,N,0.48247
-2020,CDR,CF,DTR2.2,N,BE,N,-0.36703
+2020,CDR,EOP,DTR2.2,N,BE,C,0.00962
+2020,CDR,BOP,DTR2.2,N,BE,N,0.04024
+2020,CDR,CF,DTR2.2,N,BE,N,-0.03062
 2020,NIC,EOP,DTR2.2,N,BE,C,-150
 2020,NIC,BOP,DTR2.2,N,BE,N,-300
 2020,NIC,CF,DTR2.2,N,BE,N,150
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__C.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__C.csv
index d0077750..bdec6931 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__C.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__C.csv
@@ -3,61 +3,61 @@ Month,ReportingNode,Scenario,Year
 12,CH,,2020
 @@C
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,IA,DT1.4,,C,N,0.08233
-,,BOP,DT1.4,,C,N,139.90849
-,,EOP,DT1.4,,C,C,42.96811
-,,AM,DT1.4,,C,C,-82.02271
-,,EA,DT1.4,,C,C,-15
-,,EA,DT1.1,,C,C,-15
 ,,AM,DT1.1,,C,C,-82.02271
+,,EA,DT1.1,,C,C,-15
 ,,EOP,DT1.1,,C,C,42.96811
 ,,BOP,DT1.1,,C,N,139.90849
 ,,IA,DT1.1,,C,N,0.08233
-,,EA,DT2.1,,C,C,-15
-,,AM,DT2.1,,C,C,-82.02271
-,,EOP,DT2.1,,C,C,42.96811
-,,BOP,DT2.1,,C,N,139.90849
-,,IA,DT2.1,,C,N,0.08233
-,,EA,DT1.3,,C,C,-15
 ,,AM,DT1.3,,C,C,-82.02271
+,,EA,DT1.3,,C,C,-15
 ,,EOP,DT1.3,,C,C,42.96811
 ,,BOP,DT1.3,,C,N,139.90849
 ,,IA,DT1.3,,C,N,0.08233
-,,AM,DTR1.1,,C,C,46.24958
-,,EOP,DTR1.1,,C,C,-24.22813
-,,BOP,DTR1.1,,C,N,-70.43538
-,,IA,DTR1.1,,C,N,-0.04234
-,,AM,DTR2.1,,C,C,46.24958
-,,EOP,DTR2.1,,C,C,-24.22813
-,,BOP,DTR2.1,,C,N,-70.43538
-,,IA,DTR2.1,,C,N,-0.04234
-,,BOP,DT3.1,,C,I,72.2
-,,EA,DT3.1,,C,C,-15
+,,AM,DT1.4,,C,C,-82.02271
+,,EA,DT1.4,,C,C,-15
+,,EOP,DT1.4,,C,C,42.96811
+,,BOP,DT1.4,,C,N,139.90849
+,,IA,DT1.4,,C,N,0.08233
+,,AM,DT1.5,,C,C,-82.02271
+,,EA,DT1.5,,C,C,-15
+,,EOP,DT1.5,,C,C,42.96811
+,,BOP,DT1.5,,C,N,139.90849
+,,IA,DT1.5,,C,N,0.08233
+,,AM,DT2.1,,C,C,-82.02271
+,,EA,DT2.1,,C,C,-15
+,,EOP,DT2.1,,C,C,42.96811
+,,BOP,DT2.1,,C,N,139.90849
+,,IA,DT2.1,,C,N,0.08233
 ,,AM,DT3.1,,C,C,-129.49727
+,,EA,DT3.1,,C,C,-15
 ,,EOP,DT3.1,,C,C,67.83796
+,,BOP,DT3.1,,C,I,72.2
 ,,IA,DT3.1,,C,I,0.1444
 ,,BOP,DT3.1,,C,N,139.90849
 ,,IA,DT3.1,,C,N,0.08233
-,,EA,DT4.1,,C,C,-15
 ,,AM,DT4.1,,C,C,-82.02271
+,,EA,DT4.1,,C,C,-15
 ,,EOP,DT4.1,,C,C,42.96811
 ,,BOP,DT4.1,,C,N,139.90849
 ,,IA,DT4.1,,C,N,0.08233
-,,EA,DT1.5,,C,C,-15
-,,AM,DT1.5,,C,C,-82.02271
-,,EOP,DT1.5,,C,C,42.96811
-,,BOP,DT1.5,,C,N,139.90849
-,,IA,DT1.5,,C,N,0.08233
-,,AM,DTR1.3,,C,C,46.24958
-,,EOP,DTR1.3,,C,C,-24.22813
-,,BOP,DTR1.3,,C,N,-70.43538
-,,IA,DTR1.3,,C,N,-0.04234
-,,AM,DTR1.4,,C,C,46.24958
-,,EOP,DTR1.4,,C,C,-24.22813
-,,BOP,DTR1.4,,C,N,-70.43538
-,,IA,DTR1.4,,C,N,-0.04234
-,,EA,DT5.1,,C,C,-15
 ,,AM,DT5.1,,C,C,-82.02271
+,,EA,DT5.1,,C,C,-15
 ,,EOP,DT5.1,,C,C,42.96811
 ,,BOP,DT5.1,,C,N,139.90849
-,,IA,DT5.1,,C,N,0.08233
\ No newline at end of file
+,,IA,DT5.1,,C,N,0.08233
+,,AM,DTR1.1,,C,C,45.95948
+,,EOP,DTR1.1,,C,C,-24.07616
+,,BOP,DTR1.1,,C,N,-69.99438
+,,IA,DTR1.1,,C,N,-0.04126
+,,AM,DTR1.3,,C,C,45.95948
+,,EOP,DTR1.3,,C,C,-24.07616
+,,BOP,DTR1.3,,C,N,-69.99438
+,,IA,DTR1.3,,C,N,-0.04126
+,,AM,DTR1.4,,C,C,45.95948
+,,EOP,DTR1.4,,C,C,-24.07616
+,,BOP,DTR1.4,,C,N,-69.99438
+,,IA,DTR1.4,,C,N,-0.04126
+,,AM,DTR2.1,,C,C,45.95948
+,,EOP,DTR2.1,,C,C,-24.07616
+,,BOP,DTR2.1,,C,N,-69.99438
+,,IA,DTR2.1,,C,N,-0.04126
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BE.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BE.csv
index 24ac65d0..4f079162 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BE.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BE.csv
@@ -496,17 +496,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DT4.1,N,BE,N,-80
 ,PR,CF,DT4.1,N,BE,N,20
 ,PR,EV,DT4.1,N,BE,N,-39
-,CDR,EOP,DTR1.1,C,BE,C,0.96385
-,CDR,BOP,DTR1.1,C,BE,I,0.11527
-,CDR,CF,DTR1.1,C,BE,I,-0.04197
-,CDR,CRU,DTR1.1,C,BE,I,0.59233
-,CDR,IA,DTR1.1,C,BE,I,8E-05
-,CDR,MC,DTR1.1,C,BE,I,-0.02305
-,CDR,YCU,DTR1.1,C,BE,I,-8E-05
-,CDR,BOP,DTR1.1,C,BE,N,0.29374
-,CDR,CF,DTR1.1,C,BE,N,-0.13371
-,CDR,EV,DTR1.1,C,BE,N,0.16064
-,CDR,IA,DTR1.1,C,BE,N,0.00061
+,CDR,EOP,DTR1.1,C,BE,C,0.08063
+,CDR,BOP,DTR1.1,C,BE,I,0.00961
+,CDR,CF,DTR1.1,C,BE,I,-0.0035
+,CDR,CRU,DTR1.1,C,BE,I,0.04957
+,CDR,MC,DTR1.1,C,BE,I,-0.00192
+,CDR,BOP,DTR1.1,C,BE,N,0.02461
+,CDR,CF,DTR1.1,C,BE,N,-0.01123
+,CDR,EV,DTR1.1,C,BE,N,0.01344
+,CDR,IA,DTR1.1,C,BE,N,5E-05
 ,NIC,EOP,DTR1.1,C,BE,C,-134.71982
 ,NIC,BOP,DTR1.1,C,BE,I,-149.83777
 ,NIC,CF,DTR1.1,C,BE,I,30
@@ -527,16 +525,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR1.1,C,BE,N,-5
 ,PR,EV,DTR1.1,C,BE,N,-7.48755
 ,PR,IA,DTR1.1,C,BE,N,0.02074
-,CDR,EOP,DTR1.1,L,BE,C,0.96546
-,CDR,BOP,DTR1.1,L,BE,I,0.11527
-,CDR,CF,DTR1.1,L,BE,I,-0.04197
-,CDR,CRU,DTR1.1,L,BE,I,0.59331
-,CDR,IA,DTR1.1,L,BE,I,8E-05
-,CDR,MC,DTR1.1,L,BE,I,-0.02305
-,CDR,BOP,DTR1.1,L,BE,N,0.29437
-,CDR,CF,DTR1.1,L,BE,N,-0.13371
-,CDR,EV,DTR1.1,L,BE,N,0.16091
-,CDR,IA,DTR1.1,L,BE,N,0.00025
+,CDR,EOP,DTR1.1,L,BE,C,0.08076
+,CDR,BOP,DTR1.1,L,BE,I,0.00961
+,CDR,CF,DTR1.1,L,BE,I,-0.0035
+,CDR,CRU,DTR1.1,L,BE,I,0.04965
+,CDR,MC,DTR1.1,L,BE,I,-0.00192
+,CDR,BOP,DTR1.1,L,BE,N,0.02467
+,CDR,CF,DTR1.1,L,BE,N,-0.01123
+,CDR,EV,DTR1.1,L,BE,N,0.01346
+,CDR,IA,DTR1.1,L,BE,N,2E-05
 ,NIC,EOP,DTR1.1,L,BE,C,-134.88767
 ,NIC,BOP,DTR1.1,L,BE,I,-149.83777
 ,NIC,CF,DTR1.1,L,BE,I,30
@@ -555,14 +552,14 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR1.1,L,BE,N,-5
 ,PR,EV,DTR1.1,L,BE,N,-7.49501
 ,PR,IA,DTR1.1,L,BE,N,0.00832
-,CDR,EOP,DTR1.1,N,BE,C,0.96653
-,CDR,BOP,DTR1.1,N,BE,I,0.11544
-,CDR,CF,DTR1.1,N,BE,I,-0.04197
-,CDR,CRU,DTR1.1,N,BE,I,0.59397
-,CDR,MC,DTR1.1,N,BE,I,-0.02309
-,CDR,BOP,DTR1.1,N,BE,N,0.2948
-,CDR,CF,DTR1.1,N,BE,N,-0.13371
-,CDR,EV,DTR1.1,N,BE,N,0.16109
+,CDR,EOP,DTR1.1,N,BE,C,0.08085
+,CDR,BOP,DTR1.1,N,BE,I,0.00962
+,CDR,CF,DTR1.1,N,BE,I,-0.0035
+,CDR,CRU,DTR1.1,N,BE,I,0.0497
+,CDR,MC,DTR1.1,N,BE,I,-0.00192
+,CDR,BOP,DTR1.1,N,BE,N,0.0247
+,CDR,CF,DTR1.1,N,BE,N,-0.01123
+,CDR,EV,DTR1.1,N,BE,N,0.01348
 ,NIC,EOP,DTR1.1,N,BE,C,-135
 ,NIC,BOP,DTR1.1,N,BE,I,-150
 ,NIC,CF,DTR1.1,N,BE,I,30
@@ -577,17 +574,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.1,N,BE,N,20
 ,PR,CF,DTR1.1,N,BE,N,-5
 ,PR,EV,DTR1.1,N,BE,N,-7.5
-2020,CDR,EOP,DTR1.2,C,BE,C,0.96385
-2020,CDR,BOP,DTR1.2,C,BE,I,0.11527
-2020,CDR,CF,DTR1.2,C,BE,I,-0.04197
-2020,CDR,CRU,DTR1.2,C,BE,I,0.59233
-2020,CDR,IA,DTR1.2,C,BE,I,8E-05
-2020,CDR,MC,DTR1.2,C,BE,I,-0.02305
-2020,CDR,YCU,DTR1.2,C,BE,I,-8E-05
-2020,CDR,BOP,DTR1.2,C,BE,N,0.29374
-2020,CDR,CF,DTR1.2,C,BE,N,-0.13371
-2020,CDR,EV,DTR1.2,C,BE,N,0.16064
-2020,CDR,IA,DTR1.2,C,BE,N,0.00061
+2020,CDR,EOP,DTR1.2,C,BE,C,0.08063
+2020,CDR,BOP,DTR1.2,C,BE,I,0.00961
+2020,CDR,CF,DTR1.2,C,BE,I,-0.0035
+2020,CDR,CRU,DTR1.2,C,BE,I,0.04957
+2020,CDR,MC,DTR1.2,C,BE,I,-0.00192
+2020,CDR,BOP,DTR1.2,C,BE,N,0.02461
+2020,CDR,CF,DTR1.2,C,BE,N,-0.01123
+2020,CDR,EV,DTR1.2,C,BE,N,0.01344
+2020,CDR,IA,DTR1.2,C,BE,N,5E-05
 2020,NIC,EOP,DTR1.2,C,BE,C,-134.71982
 2020,NIC,BOP,DTR1.2,C,BE,I,-149.83777
 2020,NIC,CF,DTR1.2,C,BE,I,30
@@ -598,16 +593,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,CF,DTR1.2,C,BE,N,7.5
 2020,NIC,EV,DTR1.2,C,BE,N,-22.4533
 2020,NIC,IA,DTR1.2,C,BE,N,-0.03421
-2020,CDR,EOP,DTR1.2,L,BE,C,0.96546
-2020,CDR,BOP,DTR1.2,L,BE,I,0.11527
-2020,CDR,CF,DTR1.2,L,BE,I,-0.04197
-2020,CDR,CRU,DTR1.2,L,BE,I,0.59331
-2020,CDR,IA,DTR1.2,L,BE,I,8E-05
-2020,CDR,MC,DTR1.2,L,BE,I,-0.02305
-2020,CDR,BOP,DTR1.2,L,BE,N,0.29437
-2020,CDR,CF,DTR1.2,L,BE,N,-0.13371
-2020,CDR,EV,DTR1.2,L,BE,N,0.16091
-2020,CDR,IA,DTR1.2,L,BE,N,0.00025
+2020,CDR,EOP,DTR1.2,L,BE,C,0.08076
+2020,CDR,BOP,DTR1.2,L,BE,I,0.00961
+2020,CDR,CF,DTR1.2,L,BE,I,-0.0035
+2020,CDR,CRU,DTR1.2,L,BE,I,0.04965
+2020,CDR,MC,DTR1.2,L,BE,I,-0.00192
+2020,CDR,BOP,DTR1.2,L,BE,N,0.02467
+2020,CDR,CF,DTR1.2,L,BE,N,-0.01123
+2020,CDR,EV,DTR1.2,L,BE,N,0.01346
+2020,CDR,IA,DTR1.2,L,BE,N,2E-05
 2020,NIC,EOP,DTR1.2,L,BE,C,-134.88767
 2020,NIC,BOP,DTR1.2,L,BE,I,-149.83777
 2020,NIC,CF,DTR1.2,L,BE,I,30
@@ -617,14 +611,14 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,CF,DTR1.2,L,BE,N,7.5
 2020,NIC,EV,DTR1.2,L,BE,N,-22.48128
 2020,NIC,IA,DTR1.2,L,BE,N,-0.01372
-2020,CDR,EOP,DTR1.2,N,BE,C,0.96653
-2020,CDR,BOP,DTR1.2,N,BE,I,0.11544
-2020,CDR,CF,DTR1.2,N,BE,I,-0.04197
-2020,CDR,CRU,DTR1.2,N,BE,I,0.59397
-2020,CDR,MC,DTR1.2,N,BE,I,-0.02309
-2020,CDR,BOP,DTR1.2,N,BE,N,0.2948
-2020,CDR,CF,DTR1.2,N,BE,N,-0.13371
-2020,CDR,EV,DTR1.2,N,BE,N,0.16109
+2020,CDR,EOP,DTR1.2,N,BE,C,0.08085
+2020,CDR,BOP,DTR1.2,N,BE,I,0.00962
+2020,CDR,CF,DTR1.2,N,BE,I,-0.0035
+2020,CDR,CRU,DTR1.2,N,BE,I,0.0497
+2020,CDR,MC,DTR1.2,N,BE,I,-0.00192
+2020,CDR,BOP,DTR1.2,N,BE,N,0.0247
+2020,CDR,CF,DTR1.2,N,BE,N,-0.01123
+2020,CDR,EV,DTR1.2,N,BE,N,0.01348
 2020,NIC,EOP,DTR1.2,N,BE,C,-135
 2020,NIC,BOP,DTR1.2,N,BE,I,-150
 2020,NIC,CF,DTR1.2,N,BE,I,30
@@ -632,17 +626,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,BOP,DTR1.2,N,BE,N,-30
 2020,NIC,CF,DTR1.2,N,BE,N,7.5
 2020,NIC,EV,DTR1.2,N,BE,N,-22.5
-,CDR,EOP,DTR1.3,C,BE,C,0.96385
-,CDR,BOP,DTR1.3,C,BE,I,0.11527
-,CDR,CF,DTR1.3,C,BE,I,-0.04197
-,CDR,CRU,DTR1.3,C,BE,I,0.59233
-,CDR,IA,DTR1.3,C,BE,I,8E-05
-,CDR,MC,DTR1.3,C,BE,I,-0.02305
-,CDR,YCU,DTR1.3,C,BE,I,-8E-05
-,CDR,BOP,DTR1.3,C,BE,N,0.29374
-,CDR,CF,DTR1.3,C,BE,N,-0.13371
-,CDR,EV,DTR1.3,C,BE,N,0.16064
-,CDR,IA,DTR1.3,C,BE,N,0.00061
+,CDR,EOP,DTR1.3,C,BE,C,0.08063
+,CDR,BOP,DTR1.3,C,BE,I,0.00961
+,CDR,CF,DTR1.3,C,BE,I,-0.0035
+,CDR,CRU,DTR1.3,C,BE,I,0.04957
+,CDR,MC,DTR1.3,C,BE,I,-0.00192
+,CDR,BOP,DTR1.3,C,BE,N,0.02461
+,CDR,CF,DTR1.3,C,BE,N,-0.01123
+,CDR,EV,DTR1.3,C,BE,N,0.01344
+,CDR,IA,DTR1.3,C,BE,N,5E-05
 ,NIC,EOP,DTR1.3,C,BE,C,-134.71982
 ,NIC,BOP,DTR1.3,C,BE,I,-149.83777
 ,NIC,CF,DTR1.3,C,BE,I,30
@@ -663,16 +655,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR1.3,C,BE,N,-5
 ,PR,EV,DTR1.3,C,BE,N,-7.48755
 ,PR,IA,DTR1.3,C,BE,N,0.02074
-,CDR,EOP,DTR1.3,L,BE,C,0.96546
-,CDR,BOP,DTR1.3,L,BE,I,0.11527
-,CDR,CF,DTR1.3,L,BE,I,-0.04197
-,CDR,CRU,DTR1.3,L,BE,I,0.59331
-,CDR,IA,DTR1.3,L,BE,I,8E-05
-,CDR,MC,DTR1.3,L,BE,I,-0.02305
-,CDR,BOP,DTR1.3,L,BE,N,0.29437
-,CDR,CF,DTR1.3,L,BE,N,-0.13371
-,CDR,EV,DTR1.3,L,BE,N,0.16091
-,CDR,IA,DTR1.3,L,BE,N,0.00025
+,CDR,EOP,DTR1.3,L,BE,C,0.08076
+,CDR,BOP,DTR1.3,L,BE,I,0.00961
+,CDR,CF,DTR1.3,L,BE,I,-0.0035
+,CDR,CRU,DTR1.3,L,BE,I,0.04965
+,CDR,MC,DTR1.3,L,BE,I,-0.00192
+,CDR,BOP,DTR1.3,L,BE,N,0.02467
+,CDR,CF,DTR1.3,L,BE,N,-0.01123
+,CDR,EV,DTR1.3,L,BE,N,0.01346
+,CDR,IA,DTR1.3,L,BE,N,2E-05
 ,NIC,EOP,DTR1.3,L,BE,C,-134.88767
 ,NIC,BOP,DTR1.3,L,BE,I,-149.83777
 ,NIC,CF,DTR1.3,L,BE,I,30
@@ -691,14 +682,14 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR1.3,L,BE,N,-5
 ,PR,EV,DTR1.3,L,BE,N,-7.49501
 ,PR,IA,DTR1.3,L,BE,N,0.00832
-,CDR,EOP,DTR1.3,N,BE,C,0.96653
-,CDR,BOP,DTR1.3,N,BE,I,0.11544
-,CDR,CF,DTR1.3,N,BE,I,-0.04197
-,CDR,CRU,DTR1.3,N,BE,I,0.59397
-,CDR,MC,DTR1.3,N,BE,I,-0.02309
-,CDR,BOP,DTR1.3,N,BE,N,0.2948
-,CDR,CF,DTR1.3,N,BE,N,-0.13371
-,CDR,EV,DTR1.3,N,BE,N,0.16109
+,CDR,EOP,DTR1.3,N,BE,C,0.08085
+,CDR,BOP,DTR1.3,N,BE,I,0.00962
+,CDR,CF,DTR1.3,N,BE,I,-0.0035
+,CDR,CRU,DTR1.3,N,BE,I,0.0497
+,CDR,MC,DTR1.3,N,BE,I,-0.00192
+,CDR,BOP,DTR1.3,N,BE,N,0.0247
+,CDR,CF,DTR1.3,N,BE,N,-0.01123
+,CDR,EV,DTR1.3,N,BE,N,0.01348
 ,NIC,EOP,DTR1.3,N,BE,C,-135
 ,NIC,BOP,DTR1.3,N,BE,I,-150
 ,NIC,CF,DTR1.3,N,BE,I,30
@@ -713,17 +704,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.3,N,BE,N,20
 ,PR,CF,DTR1.3,N,BE,N,-5
 ,PR,EV,DTR1.3,N,BE,N,-7.5
-,CDR,EOP,DTR1.4,C,BE,C,0.96385
-,CDR,BOP,DTR1.4,C,BE,I,0.11527
-,CDR,CF,DTR1.4,C,BE,I,-0.04197
-,CDR,CRU,DTR1.4,C,BE,I,0.59233
-,CDR,IA,DTR1.4,C,BE,I,8E-05
-,CDR,MC,DTR1.4,C,BE,I,-0.02305
-,CDR,YCU,DTR1.4,C,BE,I,-8E-05
-,CDR,BOP,DTR1.4,C,BE,N,0.29374
-,CDR,CF,DTR1.4,C,BE,N,-0.13371
-,CDR,EV,DTR1.4,C,BE,N,0.16064
-,CDR,IA,DTR1.4,C,BE,N,0.00061
+,CDR,EOP,DTR1.4,C,BE,C,0.08063
+,CDR,BOP,DTR1.4,C,BE,I,0.00961
+,CDR,CF,DTR1.4,C,BE,I,-0.0035
+,CDR,CRU,DTR1.4,C,BE,I,0.04957
+,CDR,MC,DTR1.4,C,BE,I,-0.00192
+,CDR,BOP,DTR1.4,C,BE,N,0.02461
+,CDR,CF,DTR1.4,C,BE,N,-0.01123
+,CDR,EV,DTR1.4,C,BE,N,0.01344
+,CDR,IA,DTR1.4,C,BE,N,5E-05
 ,NIC,EOP,DTR1.4,C,BE,C,-134.71982
 ,NIC,BOP,DTR1.4,C,BE,I,-149.83777
 ,NIC,CF,DTR1.4,C,BE,I,30
@@ -744,16 +733,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR1.4,C,BE,N,-5
 ,PR,EV,DTR1.4,C,BE,N,-7.48755
 ,PR,IA,DTR1.4,C,BE,N,0.02074
-,CDR,EOP,DTR1.4,L,BE,C,0.96546
-,CDR,BOP,DTR1.4,L,BE,I,0.11527
-,CDR,CF,DTR1.4,L,BE,I,-0.04197
-,CDR,CRU,DTR1.4,L,BE,I,0.59331
-,CDR,IA,DTR1.4,L,BE,I,8E-05
-,CDR,MC,DTR1.4,L,BE,I,-0.02305
-,CDR,BOP,DTR1.4,L,BE,N,0.29437
-,CDR,CF,DTR1.4,L,BE,N,-0.13371
-,CDR,EV,DTR1.4,L,BE,N,0.16091
-,CDR,IA,DTR1.4,L,BE,N,0.00025
+,CDR,EOP,DTR1.4,L,BE,C,0.08076
+,CDR,BOP,DTR1.4,L,BE,I,0.00961
+,CDR,CF,DTR1.4,L,BE,I,-0.0035
+,CDR,CRU,DTR1.4,L,BE,I,0.04965
+,CDR,MC,DTR1.4,L,BE,I,-0.00192
+,CDR,BOP,DTR1.4,L,BE,N,0.02467
+,CDR,CF,DTR1.4,L,BE,N,-0.01123
+,CDR,EV,DTR1.4,L,BE,N,0.01346
+,CDR,IA,DTR1.4,L,BE,N,2E-05
 ,NIC,EOP,DTR1.4,L,BE,C,-134.88767
 ,NIC,BOP,DTR1.4,L,BE,I,-149.83777
 ,NIC,CF,DTR1.4,L,BE,I,30
@@ -772,14 +760,14 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR1.4,L,BE,N,-5
 ,PR,EV,DTR1.4,L,BE,N,-7.49501
 ,PR,IA,DTR1.4,L,BE,N,0.00832
-,CDR,EOP,DTR1.4,N,BE,C,0.96653
-,CDR,BOP,DTR1.4,N,BE,I,0.11544
-,CDR,CF,DTR1.4,N,BE,I,-0.04197
-,CDR,CRU,DTR1.4,N,BE,I,0.59397
-,CDR,MC,DTR1.4,N,BE,I,-0.02309
-,CDR,BOP,DTR1.4,N,BE,N,0.2948
-,CDR,CF,DTR1.4,N,BE,N,-0.13371
-,CDR,EV,DTR1.4,N,BE,N,0.16109
+,CDR,EOP,DTR1.4,N,BE,C,0.08085
+,CDR,BOP,DTR1.4,N,BE,I,0.00962
+,CDR,CF,DTR1.4,N,BE,I,-0.0035
+,CDR,CRU,DTR1.4,N,BE,I,0.0497
+,CDR,MC,DTR1.4,N,BE,I,-0.00192
+,CDR,BOP,DTR1.4,N,BE,N,0.0247
+,CDR,CF,DTR1.4,N,BE,N,-0.01123
+,CDR,EV,DTR1.4,N,BE,N,0.01348
 ,NIC,EOP,DTR1.4,N,BE,C,-135
 ,NIC,BOP,DTR1.4,N,BE,I,-150
 ,NIC,CF,DTR1.4,N,BE,I,30
@@ -794,17 +782,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR1.4,N,BE,N,20
 ,PR,CF,DTR1.4,N,BE,N,-5
 ,PR,EV,DTR1.4,N,BE,N,-7.5
-,CDR,EOP,DTR2.1,C,BE,C,0.96385
-,CDR,BOP,DTR2.1,C,BE,I,0.11527
-,CDR,CF,DTR2.1,C,BE,I,-0.04197
-,CDR,CRU,DTR2.1,C,BE,I,0.59233
-,CDR,IA,DTR2.1,C,BE,I,8E-05
-,CDR,MC,DTR2.1,C,BE,I,-0.02305
-,CDR,YCU,DTR2.1,C,BE,I,-8E-05
-,CDR,BOP,DTR2.1,C,BE,N,0.29374
-,CDR,CF,DTR2.1,C,BE,N,-0.13371
-,CDR,EV,DTR2.1,C,BE,N,0.16064
-,CDR,IA,DTR2.1,C,BE,N,0.00061
+,CDR,EOP,DTR2.1,C,BE,C,0.08063
+,CDR,BOP,DTR2.1,C,BE,I,0.00961
+,CDR,CF,DTR2.1,C,BE,I,-0.0035
+,CDR,CRU,DTR2.1,C,BE,I,0.04957
+,CDR,MC,DTR2.1,C,BE,I,-0.00192
+,CDR,BOP,DTR2.1,C,BE,N,0.02461
+,CDR,CF,DTR2.1,C,BE,N,-0.01123
+,CDR,EV,DTR2.1,C,BE,N,0.01344
+,CDR,IA,DTR2.1,C,BE,N,5E-05
 ,NIC,EOP,DTR2.1,C,BE,C,-134.71982
 ,NIC,BOP,DTR2.1,C,BE,I,-149.83777
 ,NIC,CF,DTR2.1,C,BE,I,30
@@ -825,16 +811,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR2.1,C,BE,N,-5
 ,PR,EV,DTR2.1,C,BE,N,-7.48755
 ,PR,IA,DTR2.1,C,BE,N,0.02074
-,CDR,EOP,DTR2.1,L,BE,C,0.96546
-,CDR,BOP,DTR2.1,L,BE,I,0.11527
-,CDR,CF,DTR2.1,L,BE,I,-0.04197
-,CDR,CRU,DTR2.1,L,BE,I,0.59331
-,CDR,IA,DTR2.1,L,BE,I,8E-05
-,CDR,MC,DTR2.1,L,BE,I,-0.02305
-,CDR,BOP,DTR2.1,L,BE,N,0.29437
-,CDR,CF,DTR2.1,L,BE,N,-0.13371
-,CDR,EV,DTR2.1,L,BE,N,0.16091
-,CDR,IA,DTR2.1,L,BE,N,0.00025
+,CDR,EOP,DTR2.1,L,BE,C,0.08076
+,CDR,BOP,DTR2.1,L,BE,I,0.00961
+,CDR,CF,DTR2.1,L,BE,I,-0.0035
+,CDR,CRU,DTR2.1,L,BE,I,0.04965
+,CDR,MC,DTR2.1,L,BE,I,-0.00192
+,CDR,BOP,DTR2.1,L,BE,N,0.02467
+,CDR,CF,DTR2.1,L,BE,N,-0.01123
+,CDR,EV,DTR2.1,L,BE,N,0.01346
+,CDR,IA,DTR2.1,L,BE,N,2E-05
 ,NIC,EOP,DTR2.1,L,BE,C,-134.88767
 ,NIC,BOP,DTR2.1,L,BE,I,-149.83777
 ,NIC,CF,DTR2.1,L,BE,I,30
@@ -853,14 +838,14 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DTR2.1,L,BE,N,-5
 ,PR,EV,DTR2.1,L,BE,N,-7.49501
 ,PR,IA,DTR2.1,L,BE,N,0.00832
-,CDR,EOP,DTR2.1,N,BE,C,0.96653
-,CDR,BOP,DTR2.1,N,BE,I,0.11544
-,CDR,CF,DTR2.1,N,BE,I,-0.04197
-,CDR,CRU,DTR2.1,N,BE,I,0.59397
-,CDR,MC,DTR2.1,N,BE,I,-0.02309
-,CDR,BOP,DTR2.1,N,BE,N,0.2948
-,CDR,CF,DTR2.1,N,BE,N,-0.13371
-,CDR,EV,DTR2.1,N,BE,N,0.16109
+,CDR,EOP,DTR2.1,N,BE,C,0.08085
+,CDR,BOP,DTR2.1,N,BE,I,0.00962
+,CDR,CF,DTR2.1,N,BE,I,-0.0035
+,CDR,CRU,DTR2.1,N,BE,I,0.0497
+,CDR,MC,DTR2.1,N,BE,I,-0.00192
+,CDR,BOP,DTR2.1,N,BE,N,0.0247
+,CDR,CF,DTR2.1,N,BE,N,-0.01123
+,CDR,EV,DTR2.1,N,BE,N,0.01348
 ,NIC,EOP,DTR2.1,N,BE,C,-135
 ,NIC,BOP,DTR2.1,N,BE,I,-150
 ,NIC,CF,DTR2.1,N,BE,I,30
@@ -875,17 +860,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DTR2.1,N,BE,N,20
 ,PR,CF,DTR2.1,N,BE,N,-5
 ,PR,EV,DTR2.1,N,BE,N,-7.5
-2020,CDR,EOP,DTR2.2,C,BE,C,0.96385
-2020,CDR,BOP,DTR2.2,C,BE,I,0.11527
-2020,CDR,CF,DTR2.2,C,BE,I,-0.04197
-2020,CDR,CRU,DTR2.2,C,BE,I,0.59233
-2020,CDR,IA,DTR2.2,C,BE,I,8E-05
-2020,CDR,MC,DTR2.2,C,BE,I,-0.02305
-2020,CDR,YCU,DTR2.2,C,BE,I,-8E-05
-2020,CDR,BOP,DTR2.2,C,BE,N,0.29374
-2020,CDR,CF,DTR2.2,C,BE,N,-0.13371
-2020,CDR,EV,DTR2.2,C,BE,N,0.16064
-2020,CDR,IA,DTR2.2,C,BE,N,0.00061
+2020,CDR,EOP,DTR2.2,C,BE,C,0.08063
+2020,CDR,BOP,DTR2.2,C,BE,I,0.00961
+2020,CDR,CF,DTR2.2,C,BE,I,-0.0035
+2020,CDR,CRU,DTR2.2,C,BE,I,0.04957
+2020,CDR,MC,DTR2.2,C,BE,I,-0.00192
+2020,CDR,BOP,DTR2.2,C,BE,N,0.02461
+2020,CDR,CF,DTR2.2,C,BE,N,-0.01123
+2020,CDR,EV,DTR2.2,C,BE,N,0.01344
+2020,CDR,IA,DTR2.2,C,BE,N,5E-05
 2020,NIC,EOP,DTR2.2,C,BE,C,-134.71982
 2020,NIC,BOP,DTR2.2,C,BE,I,-149.83777
 2020,NIC,CF,DTR2.2,C,BE,I,30
@@ -896,16 +879,15 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,CF,DTR2.2,C,BE,N,7.5
 2020,NIC,EV,DTR2.2,C,BE,N,-22.4533
 2020,NIC,IA,DTR2.2,C,BE,N,-0.03421
-2020,CDR,EOP,DTR2.2,L,BE,C,0.96546
-2020,CDR,BOP,DTR2.2,L,BE,I,0.11527
-2020,CDR,CF,DTR2.2,L,BE,I,-0.04197
-2020,CDR,CRU,DTR2.2,L,BE,I,0.59331
-2020,CDR,IA,DTR2.2,L,BE,I,8E-05
-2020,CDR,MC,DTR2.2,L,BE,I,-0.02305
-2020,CDR,BOP,DTR2.2,L,BE,N,0.29437
-2020,CDR,CF,DTR2.2,L,BE,N,-0.13371
-2020,CDR,EV,DTR2.2,L,BE,N,0.16091
-2020,CDR,IA,DTR2.2,L,BE,N,0.00025
+2020,CDR,EOP,DTR2.2,L,BE,C,0.08076
+2020,CDR,BOP,DTR2.2,L,BE,I,0.00961
+2020,CDR,CF,DTR2.2,L,BE,I,-0.0035
+2020,CDR,CRU,DTR2.2,L,BE,I,0.04965
+2020,CDR,MC,DTR2.2,L,BE,I,-0.00192
+2020,CDR,BOP,DTR2.2,L,BE,N,0.02467
+2020,CDR,CF,DTR2.2,L,BE,N,-0.01123
+2020,CDR,EV,DTR2.2,L,BE,N,0.01346
+2020,CDR,IA,DTR2.2,L,BE,N,2E-05
 2020,NIC,EOP,DTR2.2,L,BE,C,-134.88767
 2020,NIC,BOP,DTR2.2,L,BE,I,-149.83777
 2020,NIC,CF,DTR2.2,L,BE,I,30
@@ -915,14 +897,14 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,CF,DTR2.2,L,BE,N,7.5
 2020,NIC,EV,DTR2.2,L,BE,N,-22.48128
 2020,NIC,IA,DTR2.2,L,BE,N,-0.01372
-2020,CDR,EOP,DTR2.2,N,BE,C,0.96653
-2020,CDR,BOP,DTR2.2,N,BE,I,0.11544
-2020,CDR,CF,DTR2.2,N,BE,I,-0.04197
-2020,CDR,CRU,DTR2.2,N,BE,I,0.59397
-2020,CDR,MC,DTR2.2,N,BE,I,-0.02309
-2020,CDR,BOP,DTR2.2,N,BE,N,0.2948
-2020,CDR,CF,DTR2.2,N,BE,N,-0.13371
-2020,CDR,EV,DTR2.2,N,BE,N,0.16109
+2020,CDR,EOP,DTR2.2,N,BE,C,0.08085
+2020,CDR,BOP,DTR2.2,N,BE,I,0.00962
+2020,CDR,CF,DTR2.2,N,BE,I,-0.0035
+2020,CDR,CRU,DTR2.2,N,BE,I,0.0497
+2020,CDR,MC,DTR2.2,N,BE,I,-0.00192
+2020,CDR,BOP,DTR2.2,N,BE,N,0.0247
+2020,CDR,CF,DTR2.2,N,BE,N,-0.01123
+2020,CDR,EV,DTR2.2,N,BE,N,0.01348
 2020,NIC,EOP,DTR2.2,N,BE,C,-135
 2020,NIC,BOP,DTR2.2,N,BE,I,-150
 2020,NIC,CF,DTR2.2,N,BE,I,30
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__C.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__C.csv
index 20f516be..29c6f9dd 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__C.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__C.csv
@@ -3,80 +3,80 @@ Month,ReportingNode,Scenario,Year
 3,CH,,2021
 @@C
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,EV,DT4.1,,C,N,-1.49226
-,,IA,DT4.1,,C,N,0.00034
-,,BOP,DT4.1,,C,N,8.00465
-,,IA,DT4.1,,C,I,0.07437
-,,MC,DT4.1,,C,I,105.89201
-,,EOP,DT4.1,,C,C,71.44125
-,,AM,DT4.1,,C,C,-34.00598
-,,EA,DT4.1,,C,C,-50
-,,BOP,DT4.1,,C,I,42.96811
-,,CL,DT3.1,,C,C,-139.94507
-,,IA,DT3.1,,C,I,0.0868
-,,MC,DT3.1,,C,I,105.89201
-,,EA,DT3.1,,C,C,-33.8717
-,,BOP,DT3.1,,C,I,67.83796
-,,CL,DTR2.1,,C,C,43.26015
-,,CRU,DTR2.1,,C,I,-0.59331
-,,IA,DTR2.1,,C,I,-0.03855
-,,MC,DTR2.1,,C,I,-52.92295
-,,EOP,DTR2.1,,C,C,-23.38944
-,,AM,DTR2.1,,C,C,11.13336
-,,BOP,DTR2.1,,C,I,-24.22813
-,,CL,DTR1.1,,C,C,43.26015
-,,CRU,DTR1.1,,C,I,-0.59331
-,,IA,DTR1.1,,C,I,-0.03855
-,,MC,DTR1.1,,C,I,-52.92295
-,,EOP,DTR1.1,,C,C,-23.38944
-,,AM,DTR1.1,,C,C,11.13336
-,,BOP,DTR1.1,,C,I,-24.22813
-,,CL,DT2.1,,C,C,-87.43136
-,,BOP,DT1.1,,C,I,42.96811
-,,EA,DT1.1,,C,C,-42
 ,,AM,DT1.1,,C,C,-6.28963
+,,CL,DT1.1,,C,C,-87.43136
+,,EA,DT1.1,,C,C,-42
 ,,EOP,DT1.1,,C,C,13.21352
-,,MC,DT1.1,,C,I,105.89201
+,,BOP,DT1.1,,C,I,42.96811
 ,,IA,DT1.1,,C,I,0.07437
-,,CL,DT1.1,,C,C,-87.43136
-,,BOP,DT1.3,,C,I,42.96811
-,,EA,DT1.3,,C,C,-48
+,,MC,DT1.1,,C,I,105.89201
 ,,AM,DT1.3,,C,C,-4.35467
+,,CL,DT1.3,,C,C,-87.43136
+,,EA,DT1.3,,C,C,-48
 ,,EOP,DT1.3,,C,C,9.14848
-,,MC,DT1.3,,C,I,105.89201
+,,BOP,DT1.3,,C,I,42.96811
 ,,IA,DT1.3,,C,I,0.07437
-,,CL,DT1.3,,C,C,-87.43136
-,,BOP,DT2.1,,C,I,42.96811
-,,EA,DT2.1,,C,C,-42
-,,AM,DT2.1,,C,C,-6.28963
-,,EOP,DT2.1,,C,C,13.21352
-,,MC,DT2.1,,C,I,105.89201
-,,IA,DT2.1,,C,I,0.07437
-,,BOP,DT1.4,,C,I,42.96811
-,,EA,DT1.4,,C,C,-42
+,,MC,DT1.3,,C,I,105.89201
 ,,AM,DT1.4,,C,C,-6.28963
+,,CL,DT1.4,,C,C,-87.43136
+,,EA,DT1.4,,C,C,-42
 ,,EOP,DT1.4,,C,C,13.21352
-,,MC,DT1.4,,C,I,105.89201
+,,BOP,DT1.4,,C,I,42.96811
 ,,IA,DT1.4,,C,I,0.07437
-,,CL,DT1.4,,C,C,-87.43136
-,,BOP,DT1.5,,C,I,42.96811
-,,EA,DT1.5,,C,C,-42
+,,MC,DT1.4,,C,I,105.89201
 ,,AM,DT1.5,,C,C,-6.28963
+,,CL,DT1.5,,C,C,-87.43136
+,,EA,DT1.5,,C,C,-42
 ,,EOP,DT1.5,,C,C,13.21352
-,,MC,DT1.5,,C,I,105.89201
+,,BOP,DT1.5,,C,I,42.96811
 ,,IA,DT1.5,,C,I,0.07437
-,,CL,DT1.5,,C,C,-87.43136
-,,BOP,DTR1.3,,C,I,-24.22813
-,,AM,DTR1.3,,C,C,11.13336
-,,EOP,DTR1.3,,C,C,-23.38944
-,,MC,DTR1.3,,C,I,-52.92295
-,,IA,DTR1.3,,C,I,-0.03855
-,,CRU,DTR1.3,,C,I,-0.59331
-,,CL,DTR1.3,,C,C,43.26015
-,,BOP,DTR1.4,,C,I,-24.22813
-,,AM,DTR1.4,,C,C,11.13336
-,,EOP,DTR1.4,,C,C,-23.38944
-,,MC,DTR1.4,,C,I,-52.92295
-,,IA,DTR1.4,,C,I,-0.03855
-,,CRU,DTR1.4,,C,I,-0.59331
-,,CL,DTR1.4,,C,C,43.26015
\ No newline at end of file
+,,MC,DT1.5,,C,I,105.89201
+,,AM,DT2.1,,C,C,-6.28963
+,,CL,DT2.1,,C,C,-87.43136
+,,EA,DT2.1,,C,C,-42
+,,EOP,DT2.1,,C,C,13.21352
+,,BOP,DT2.1,,C,I,42.96811
+,,IA,DT2.1,,C,I,0.07437
+,,MC,DT2.1,,C,I,105.89201
+,,CL,DT3.1,,C,C,-139.94507
+,,EA,DT3.1,,C,C,-33.8717
+,,BOP,DT3.1,,C,I,67.83796
+,,IA,DT3.1,,C,I,0.0868
+,,MC,DT3.1,,C,I,105.89201
+,,AM,DT4.1,,C,C,-34.00598
+,,EA,DT4.1,,C,C,-50
+,,EOP,DT4.1,,C,C,71.44125
+,,BOP,DT4.1,,C,I,42.96811
+,,IA,DT4.1,,C,I,0.07437
+,,MC,DT4.1,,C,I,105.89201
+,,BOP,DT4.1,,C,N,8.00465
+,,EV,DT4.1,,C,N,-1.49226
+,,IA,DT4.1,,C,N,0.00034
+,,AM,DTR1.1,,C,C,10.78121
+,,CL,DTR1.1,,C,C,43.67753
+,,EOP,DTR1.1,,C,C,-22.64964
+,,BOP,DTR1.1,,C,I,-24.07616
+,,CRU,DTR1.1,,C,I,-0.04965
+,,IA,DTR1.1,,C,I,-0.03848
+,,MC,DTR1.1,,C,I,-52.94408
+,,AM,DTR1.3,,C,C,10.78121
+,,CL,DTR1.3,,C,C,43.67753
+,,EOP,DTR1.3,,C,C,-22.64964
+,,BOP,DTR1.3,,C,I,-24.07616
+,,CRU,DTR1.3,,C,I,-0.04965
+,,IA,DTR1.3,,C,I,-0.03848
+,,MC,DTR1.3,,C,I,-52.94408
+,,AM,DTR1.4,,C,C,10.78121
+,,CL,DTR1.4,,C,C,43.67753
+,,EOP,DTR1.4,,C,C,-22.64964
+,,BOP,DTR1.4,,C,I,-24.07616
+,,CRU,DTR1.4,,C,I,-0.04965
+,,IA,DTR1.4,,C,I,-0.03848
+,,MC,DTR1.4,,C,I,-52.94408
+,,AM,DTR2.1,,C,C,10.78121
+,,CL,DTR2.1,,C,C,43.67753
+,,EOP,DTR2.1,,C,C,-22.64964
+,,BOP,DTR2.1,,C,I,-24.07616
+,,CRU,DTR2.1,,C,I,-0.04965
+,,IA,DTR2.1,,C,I,-0.03848
+,,MC,DTR2.1,,C,I,-52.94408
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__LR.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__LR.csv
index d0638965..f579e3c5 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__LR.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__LR.csv
@@ -3,19 +3,19 @@ Month,ReportingNode,Scenario,Year
 3,CH,,2021
 @@LR
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,CL,DTR2.1,,LR,C,43.26015
-,,EV,DTR2.1,,LR,N,-27.56725
-,,IA,DTR2.1,,LR,N,-0.0079
-,,BOP,DTR2.1,,LR,N,-15.685
-,,CL,DTR1.1,,LR,C,43.26015
-,,EV,DTR1.1,,LR,N,-27.56725
-,,IA,DTR1.1,,LR,N,-0.0079
-,,BOP,DTR1.1,,LR,N,-15.685
-,,BOP,DTR1.3,,LR,N,-15.685
-,,IA,DTR1.3,,LR,N,-0.0079
-,,EV,DTR1.3,,LR,N,-27.56725
-,,CL,DTR1.3,,LR,C,43.26015
-,,BOP,DTR1.4,,LR,N,-15.685
-,,IA,DTR1.4,,LR,N,-0.0079
-,,EV,DTR1.4,,LR,N,-27.56725
-,,CL,DTR1.4,,LR,C,43.26015
\ No newline at end of file
+,,CL,DTR1.1,,LR,C,43.67753
+,,BOP,DTR1.1,,LR,N,-15.9547
+,,EV,DTR1.1,,LR,N,-27.7147
+,,IA,DTR1.1,,LR,N,-0.00813
+,,CL,DTR1.3,,LR,C,43.67753
+,,BOP,DTR1.3,,LR,N,-15.9547
+,,EV,DTR1.3,,LR,N,-27.7147
+,,IA,DTR1.3,,LR,N,-0.00813
+,,CL,DTR1.4,,LR,C,43.67753
+,,BOP,DTR1.4,,LR,N,-15.9547
+,,EV,DTR1.4,,LR,N,-27.7147
+,,IA,DTR1.4,,LR,N,-0.00813
+,,CL,DTR2.1,,LR,C,43.67753
+,,BOP,DTR2.1,,LR,N,-15.9547
+,,EV,DTR2.1,,LR,N,-27.7147
+,,IA,DTR2.1,,LR,N,-0.00813
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH_MTUP10pct_Contractual.csv b/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH_MTUP10pct_Contractual.csv
index 5c3c3747..491da5db 100644
--- a/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH_MTUP10pct_Contractual.csv
+++ b/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH_MTUP10pct_Contractual.csv
@@ -52,23 +52,23 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DT2.2,P,False,LIC,ANN,N,,,DT2,0,CH,MTUP10pct,BBA,0.09226,IA
 2020,NIC,2020,USD,USD,,A,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,170,CF
 2020,NIC,2020,USD,USD,,A,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,170,ISE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.52925,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.40374,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.1268,EOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00129,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.1268,OCI2
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04415,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03368,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.01056,EOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.01056,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-329.31412,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,165,CF
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-164.82155,EOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.50743,IA
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,164.82155,OCI2
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.52925,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.40374,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.1268,EOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00129,IA
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00129,IFIE2
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.12551,ISE12
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.1268,OCI2
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04415,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03368,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.01056,EOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.0001,IFIE2
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.01046,ISE12
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.01056,OCI2
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-329.31412,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,165,CF
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-164.82155,EOP
@@ -90,12 +90,12 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-14.98378,OCI2
 2020,NIC,2020,USD,USD,,A,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,140,CF
 2020,NIC,2020,USD,USD,,A,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,140,ISE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.48113,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.36703,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.11527,EOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00117,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.00117,IFIE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.1141,ISE12
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.04013,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.03062,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00961,EOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.0001,IA
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.0001,IFIE2
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.00951,ISE12
 2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-299.37647,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,150,CF
@@ -104,10 +104,10 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.4613,IFIE2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,149.37647,ISE12
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0,OCI2
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.48113,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.36703,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.11527,EOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00117,IA
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.04013,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.03062,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00961,EOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.0001,IA
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-299.37647,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,150,CF
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-149.83777,EOP
@@ -612,11 +612,11 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,170,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-200,CF
 0,PR,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-200,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.52925,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.40374,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.1268,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00129,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.1268,OCI1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04415,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03368,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.01056,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.01056,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-329.31412,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,165,CF
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-164.82155,EOP
@@ -627,13 +627,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,199.81696,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.5486,IA
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-199.81696,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.52925,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.40374,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.1268,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00129,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00129,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.12551,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.1268,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04415,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03368,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.01056,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.01046,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.01056,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-329.31412,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,165,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-164.82155,EOP
@@ -648,13 +648,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,199.81696,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,26.60498,AM
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-40.54585,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-13.93719,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00368,IA
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00368,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,40.54585,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-26.60498,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,26.28586,AM
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-40.06074,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-13.77001,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00487,IA
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00487,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,40.06074,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-26.28586,ISE7
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-29.93765,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,15,CF
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-14.98378,EOP
@@ -675,11 +675,11 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,4,EOP
 0,PR,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-5,CF
 0,PR,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-5,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00117,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.11527,OCI1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00961,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,150,CF
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-149.83777,EOP
@@ -690,13 +690,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,199.81696,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.5486,IA
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-199.81696,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00117,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00117,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.1141,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.11527,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00951,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00961,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,150,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-149.83777,EOP
@@ -711,13 +711,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,199.81696,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,46.24958,AM
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-70.43538,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-24.22813,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.04234,IA
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04234,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,70.43538,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-46.24958,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,45.95948,AM
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-69.99438,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-24.07616,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.04126,IA
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04126,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,69.99438,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-45.95948,ISE7
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-2.5,CF
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-2.5,EOP
 0,PR,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,7.5,CF
@@ -738,11 +738,11 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,140,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-200,CF
 0,PR,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-200,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00117,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.11527,OCI1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00961,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,150,CF
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-149.83777,EOP
@@ -753,13 +753,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,199.81696,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.5486,IA
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-199.81696,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00117,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00117,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.1141,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.11527,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.0001,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.00951,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.00961,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,150,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-149.83777,EOP
@@ -774,13 +774,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,199.81696,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,46.24958,AM
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-70.43538,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-24.22813,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.04234,IA
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04234,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,70.43538,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-46.24958,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,45.95948,AM
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-69.99438,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-24.07616,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-0.04126,IA
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,0.04126,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,69.99438,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-45.95948,ISE7
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-10,CF
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-10,EOP
 0,,2020,USD,USD,C,RA,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,MTUP10pct,BBA,-29.93765,BOP
@@ -799,12 +799,12 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,140,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-200,CF
 0,PR,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-200,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00117,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.00117,IFIE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.1141,ISE10
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.00951,ISE10
 0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,150,CF
@@ -820,10 +820,10 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00117,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.0001,IA
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,150,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-149.83777,EOP
@@ -832,13 +832,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-200,CF
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,199.81696,EOP
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.5486,IA
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,46.24958,AM
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-70.43538,BOP
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-24.22813,EOP
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.04234,IA
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.04234,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,70.43538,ISE10
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-46.24958,ISE7
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,45.95948,AM
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-69.99438,BOP
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-24.07616,EOP
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-0.04126,IA
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,0.04126,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,69.99438,ISE10
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-45.95948,ISE7
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,-29.93765,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,MTUP10pct,BBA,15,CF
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,MTUP10pct,BBA,-14.98378,EOP
diff --git a/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv b/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv
index 10afb0e9..02d8b755 100644
--- a/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv
+++ b/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv
@@ -52,23 +52,23 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DT2.2,P,False,LIC,ANN,N,,,DT2,0,CH,,BBA,0.09226,IA
 2020,NIC,2020,USD,USD,,A,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,140,CF
 2020,NIC,2020,USD,USD,,A,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,140,ISE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.11527,OCI2
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00961,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.4613,IA
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,149.83777,OCI2
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00117,IFIE2
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.1141,ISE12
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,OCI2
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.0001,IFIE2
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00951,ISE12
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,OCI2
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
@@ -90,12 +90,12 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-14.98378,OCI2
 2020,NIC,2020,USD,USD,,A,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,140,CF
 2020,NIC,2020,USD,USD,,A,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,140,ISE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.48113,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.36703,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.11527,EOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00117,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.00117,IFIE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.1141,ISE12
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.04013,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.03062,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.00961,EOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.0001,IA
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.0001,IFIE2
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.00951,ISE12
 2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-299.37647,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,150,CF
@@ -104,10 +104,10 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.4613,IFIE2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,149.37647,ISE12
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI2
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.48113,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.36703,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.11527,EOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00117,IA
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.04013,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.03062,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.00961,EOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.0001,IA
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-299.37647,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,150,CF
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-149.83777,EOP
@@ -612,11 +612,11 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,140,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-200,CF
 0,PR,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-200,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.11527,OCI1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00961,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
@@ -627,13 +627,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,199.81696,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.5486,IA
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-199.81696,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00117,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.1141,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00951,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
@@ -648,13 +648,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,199.81696,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,46.24958,AM
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-70.43538,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.22813,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.04234,IA
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.04234,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,70.43538,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-46.24958,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,45.95948,AM
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-69.99438,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.07616,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.04126,IA
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.04126,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,69.99438,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45.95948,ISE7
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.93765,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,15,CF
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-14.98378,EOP
@@ -675,11 +675,11 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,4,EOP
 0,PR,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-5,CF
 0,PR,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-5,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.11527,OCI1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00961,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
@@ -690,13 +690,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,199.81696,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.5486,IA
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-199.81696,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00117,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.1141,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00951,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
@@ -711,13 +711,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,199.81696,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,46.24958,AM
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-70.43538,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.22813,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.04234,IA
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.04234,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,70.43538,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-46.24958,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,45.95948,AM
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-69.99438,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.07616,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.04126,IA
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.04126,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,69.99438,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45.95948,ISE7
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-2.5,CF
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-2.5,EOP
 0,PR,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,7.5,CF
@@ -738,11 +738,11 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,140,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-200,CF
 0,PR,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-200,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.11527,OCI1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00961,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
@@ -753,13 +753,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,199.81696,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.5486,IA
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-199.81696,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00117,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00117,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.1141,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.11527,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.0001,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00951,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00961,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,150,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-149.83777,EOP
@@ -774,13 +774,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,199.81696,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,46.24958,AM
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-70.43538,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.22813,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.04234,IA
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.04234,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,70.43538,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-46.24958,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,45.95948,AM
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-69.99438,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.07616,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.04126,IA
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.04126,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,69.99438,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45.95948,ISE7
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-10,CF
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-10,EOP
 0,,2020,USD,USD,C,RA,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.93765,BOP
@@ -799,12 +799,12 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,140,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-200,CF
 0,PR,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-200,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00117,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.00117,IFIE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.1141,ISE10
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.0001,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.0001,IFIE1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.00951,ISE10
 0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,150,CF
@@ -820,10 +820,10 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.5486,IFIE1
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-199.26837,ISE10
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.48113,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.36703,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.11527,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00117,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.04013,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.03062,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.00961,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.0001,IA
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-299.37647,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,150,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-149.83777,EOP
@@ -832,13 +832,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-200,CF
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,199.81696,EOP
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.5486,IA
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,46.24958,AM
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-70.43538,BOP
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-24.22813,EOP
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.04234,IA
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.04234,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,70.43538,ISE10
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-46.24958,ISE7
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,45.95948,AM
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-69.99438,BOP
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-24.07616,EOP
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.04126,IA
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.04126,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,69.99438,ISE10
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-45.95948,ISE7
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-29.93765,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,15,CF
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-14.98378,EOP
diff --git a/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv b/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv
index 466c64b6..53b5ac1d 100644
--- a/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv
+++ b/ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv
@@ -96,18 +96,16 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DT2.2,P,False,LIC,ANN,I,,,DT2,0,CH,,BBA,-5.99351,MC
 2020,NIC,2020,USD,USD,,A,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,35,CF
 2020,NIC,2020,USD,USD,,A,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,35,ISE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29374,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59233,CRU
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96385,EOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16064,EV
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00061,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.84858,OCI2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-8E-05,YCU
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02461,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04957,CRU
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08063,EOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01344,EV
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,5E-05,IA
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.07102,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.91909,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -119,19 +117,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,29.96755,MC
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-15.11796,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.1119,YCU
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29437,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59331,CRU
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96546,EOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16091,EV
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00025,IA
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.59364,IFIE2
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.25655,ISE12
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.85018,OCI2
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02467,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04965,CRU
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08076,EOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01346,EV
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,2E-05,IA
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.04967,IFIE2
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.02148,ISE12
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.07115,OCI2
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.96755,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR1.2,P,True,LIC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -169,20 +166,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DTR1.2,P,True,LIC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,3.74314,OCI2
 2020,NIC,2020,USD,USD,,A,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,35,CF
 2020,NIC,2020,USD,USD,,A,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,35,ISE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.11527,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.29374,BOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.04197,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.13371,CF
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.59233,CRU
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.96385,EOP
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.16064,EV
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,8E-05,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00061,IA
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.59294,IFIE2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.25565,ISE12
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.02305,MC
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0,OCI2
-2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-8E-05,YCU
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.00961,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.02461,BOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.0035,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.01123,CF
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.04957,CRU
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.08063,EOP
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.01344,EV
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,5E-05,IA
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.04962,IFIE2
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.0214,ISE12
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.00192,MC
+2020,CDR,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-149.83777,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-29.91909,BOP
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,30,CF
@@ -196,16 +191,15 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,29.96755,MC
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI2
 2020,NIC,2020,USD,USD,C,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.1119,YCU
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.11527,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.29437,BOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.04197,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.13371,CF
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.59331,CRU
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.96546,EOP
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.16091,EV
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,8E-05,IA
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00025,IA
-2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.02305,MC
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.00961,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.02467,BOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.0035,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.01123,CF
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.04965,CRU
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.08076,EOP
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.01346,EV
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,2E-05,IA
+2020,CDR,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.00192,MC
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,-149.83777,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,0,CH,,BBA,-29.96755,BOP
 2020,NIC,2020,USD,USD,L,BE,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,0,CH,,BBA,30,CF
@@ -1083,18 +1077,16 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,35,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45,CF
 0,PR,2020,USD,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29374,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59233,CRU
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96385,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16064,EV
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00061,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.84858,OCI1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-8E-05,YCU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02461,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04957,CRU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08063,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01344,EV
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,5E-05,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.07102,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.91909,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -1117,19 +1109,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,19.9817,MC
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,27.60342,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.16416,YCU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29437,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59331,CRU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96546,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16091,EV
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00025,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.59364,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.25655,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.85018,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02467,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04965,CRU
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08076,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01346,EV
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,2E-05,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.04967,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.02148,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.07115,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.96755,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -1154,23 +1145,23 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,27.53161,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,19.9817,MC
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-27.4318,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,11.13336,AM
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-24.22813,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26015,CL
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.59331,CRU
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-23.38944,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.03855,IA
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.63186,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,9.6628,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-11.13336,ISE7
-0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-52.92295,MC
-0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-15.685,BOP
-0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26015,CL
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,10.78121,AM
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-24.07616,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.67753,CL
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04965,CRU
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-22.64964,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.03848,IA
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08813,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,9.26655,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-10.78121,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-52.94408,MC
+0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-15.9547,BOP
+0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.67753,CL
 0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0,EOP
-0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-27.56725,EV
-0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.0079,IA
-0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.0079,IFIE1
-0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.0079,ISE11
+0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-27.7147,EV
+0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.00813,IA
+0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00813,IFIE1
+0,,2020,USD,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00813,ISE11
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-14.98378,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-5.98382,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,3,CF
@@ -1206,18 +1197,16 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0,EOP
 0,PR,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-3.5,ISE1
 0,PR,2020,USD,USD,,AA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,3.5,WO
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29374,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59233,CRU
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96385,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16064,EV
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00061,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.84858,OCI1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-8E-05,YCU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02461,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04957,CRU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08063,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01344,EV
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,5E-05,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.07102,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.91909,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -1240,19 +1229,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,19.9817,MC
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,27.60342,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.16416,YCU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29437,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59331,CRU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96546,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16091,EV
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00025,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.59364,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.25655,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.85018,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02467,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04965,CRU
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08076,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01346,EV
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,2E-05,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.04967,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.02148,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.07115,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.96755,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -1277,23 +1265,23 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,27.53161,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,19.9817,MC
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-27.4318,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,11.13336,AM
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-24.22813,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26015,CL
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.59331,CRU
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-23.38944,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.03855,IA
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.63186,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,9.6628,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-11.13336,ISE7
-0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-52.92295,MC
-0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-15.685,BOP
-0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26015,CL
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,10.78121,AM
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-24.07616,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.67753,CL
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04965,CRU
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-22.64964,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.03848,IA
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08813,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,9.26655,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-10.78121,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-52.94408,MC
+0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-15.9547,BOP
+0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.67753,CL
 0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0,EOP
-0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-27.56725,EV
-0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.0079,IA
-0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.0079,IFIE1
-0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.0079,ISE11
+0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-27.7147,EV
+0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.00813,IA
+0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00813,IFIE1
+0,,2020,USD,USD,,LR,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00813,ISE11
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-2.5,BOP
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0,EOP
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.3,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-2.5,ISE2
@@ -1328,18 +1316,16 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,35,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45,CF
 0,PR,2020,USD,USD,,A,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29374,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59233,CRU
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96385,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16064,EV
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00061,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.84858,OCI1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-8E-05,YCU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02461,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04957,CRU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08063,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01344,EV
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,5E-05,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+0,CDR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.07102,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.91909,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -1362,19 +1348,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,19.9817,MC
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,27.60342,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.16416,YCU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.29437,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.59331,CRU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.96546,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.16091,EV
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.00025,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.59364,IFIE1
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.25655,ISE10
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.02305,MC
-0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.85018,OCI1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.02467,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.04965,CRU
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08076,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,0.01346,EV
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,2E-05,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.04967,IFIE1
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.02148,ISE10
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.00192,MC
+0,CDR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.07115,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.96755,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,30,CF
@@ -1399,23 +1384,23 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,27.53161,ISE10
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,19.9817,MC
 0,PR,2020,USD,USD,L,BE,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-27.4318,OCI1
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,11.13336,AM
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-24.22813,BOP
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26015,CL
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.59331,CRU
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-23.38944,EOP
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.03855,IA
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.63186,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,9.6628,ISE10
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-11.13336,ISE7
-0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-52.92295,MC
-0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-15.685,BOP
-0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26015,CL
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,10.78121,AM
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-24.07616,BOP
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.67753,CL
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04965,CRU
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-22.64964,EOP
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.03848,IA
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.08813,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,9.26655,ISE10
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-10.78121,ISE7
+0,,2020,USD,USD,,C,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-52.94408,MC
+0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-15.9547,BOP
+0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.67753,CL
 0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0,EOP
-0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-27.56725,EV
-0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.0079,IA
-0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.0079,IFIE1
-0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.0079,ISE11
+0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-27.7147,EV
+0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.00813,IA
+0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.00813,IFIE1
+0,,2020,USD,USD,,LR,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.00813,ISE11
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.4,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-10,BOP
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0,EOP
 0,NIC,2020,USD,USD,,OA,CHF,DTR1.4,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-10,ISE2
@@ -1447,20 +1432,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,NIC,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,35,ISE2
 0,PR,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-45,CF
 0,PR,2020,USD,USD,,A,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-45,ISE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.29374,BOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.59233,CRU
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.96385,EOP
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.16064,EV
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00061,IA
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.59294,IFIE1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.25565,ISE10
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.02305,MC
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0,OCI1
-0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-8E-05,YCU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.02461,BOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.04957,CRU
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.08063,EOP
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.01344,EV
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,5E-05,IA
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.04962,IFIE1
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.0214,ISE10
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.00192,MC
+0,CDR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-29.91909,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,30,CF
@@ -1487,16 +1470,15 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,19.9817,MC
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.16416,YCU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.11527,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.29437,BOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.04197,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.13371,CF
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.59331,CRU
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.96546,EOP
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.16091,EV
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,8E-05,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00025,IA
-0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.02305,MC
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.00961,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.02467,BOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.0035,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.01123,CF
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.04965,CRU
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.08076,EOP
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.01346,EV
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,2E-05,IA
+0,CDR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.00192,MC
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-149.83777,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-29.96755,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,30,CF
@@ -1515,23 +1497,23 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.0915,IA
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,0.00832,IA
 0,PR,2020,USD,USD,L,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,19.9817,MC
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,11.13336,AM
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-24.22813,BOP
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,43.26015,CL
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.59331,CRU
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-23.38944,EOP
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.03855,IA
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.63186,IFIE1
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,9.6628,ISE10
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-11.13336,ISE7
-0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-52.92295,MC
-0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-15.685,BOP
-0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,43.26015,CL
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,10.78121,AM
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-24.07616,BOP
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,43.67753,CL
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.04965,CRU
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-22.64964,EOP
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.03848,IA
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.08813,IFIE1
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,9.26655,ISE10
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-10.78121,ISE7
+0,,2020,USD,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-52.94408,MC
+0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-15.9547,BOP
+0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,43.67753,CL
 0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,EOP
-0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-27.56725,EV
-0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.0079,IA
-0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.0079,IFIE1
-0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.0079,ISE11
+0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-27.7147,EV
+0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.00813,IA
+0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.00813,IFIE1
+0,,2020,USD,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-0.00813,ISE11
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-14.98378,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-5.98382,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,3,CF
diff --git a/ifrs17-template/Test/IfrsVariablesTest.ipynb b/ifrs17-template/Test/IfrsVariablesTest.ipynb
index fc9772ba..4b8513ef 100644
--- a/ifrs17-template/Test/IfrsVariablesTest.ipynb
+++ b/ifrs17-template/Test/IfrsVariablesTest.ipynb
@@ -291,15 +291,6 @@
             "metadata": {},
             "execution_count": 0,
             "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                ""
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
         }
     ]
 }
\ No newline at end of file
diff --git a/ifrs17-template/Test/PracticalCase-CompareReinsuranceTest.ipynb b/ifrs17-template/Test/PracticalCase-CompareReinsuranceTest.ipynb
index 779c4d80..0c658c79 100644
--- a/ifrs17-template/Test/PracticalCase-CompareReinsuranceTest.ipynb
+++ b/ifrs17-template/Test/PracticalCase-CompareReinsuranceTest.ipynb
@@ -129,7 +129,7 @@
         {
             "cell_type": "code",
             "source": [
-                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==null).Sum(x=>x.Value).Should().BeApproximately(15.15453, Precision);"
+                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==null).Sum(x=>x.Value).Should().BeApproximately(15.02774, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -138,7 +138,7 @@
         {
             "cell_type": "code",
             "source": [
-                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"LR70\").Sum(x=>x.Value).Should().BeApproximately(-14.78996, Precision);"
+                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"LR70\").Sum(x=>x.Value).Should().BeApproximately(-14.93789, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -147,7 +147,7 @@
         {
             "cell_type": "code",
             "source": [
-                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"LR80\").Sum(x=>x.Value).Should().BeApproximately(-44.73446, Precision);"
+                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"LR80\").Sum(x=>x.Value).Should().BeApproximately(-44.90352, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -156,7 +156,7 @@
         {
             "cell_type": "code",
             "source": [
-                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"ELR60A70\").Sum(x=>x.Value).Should().BeApproximately(15.15453, Precision);"
+                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"ELR60A70\").Sum(x=>x.Value).Should().BeApproximately(15.02774, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -165,7 +165,7 @@
         {
             "cell_type": "code",
             "source": [
-                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"ELR60A80\").Sum(x=>x.Value).Should().BeApproximately(15.15453, Precision);"
+                "bops.Where(x => x.GroupOfContract==reinsuranceContract && x.Scenario==\"ELR60A80\").Sum(x=>x.Value).Should().BeApproximately(15.02774, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -255,7 +255,7 @@
         {
             "cell_type": "code",
             "source": [
-                "csmAM.Where(x => x.Scenario == null).Sum(x => x.Value).Should().BeApproximately(-84.86029, Precision);"
+                "csmAM.Where(x => x.Scenario == null).Sum(x => x.Value).Should().BeApproximately(-84.98727, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -264,7 +264,7 @@
         {
             "cell_type": "code",
             "source": [
-                "csmAM.Where(x => x.Scenario == \"LR70\").Sum(x => x.Value).Should().BeApproximately(-14.83859, Precision);"
+                "csmAM.Where(x => x.Scenario == \"LR70\").Sum(x => x.Value).Should().BeApproximately(-14.98673, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -273,7 +273,7 @@
         {
             "cell_type": "code",
             "source": [
-                "csmAM.Where(x => x.Scenario == \"LR80\").Sum(x => x.Value).Should().BeApproximately(-55.18393, Precision);"
+                "csmAM.Where(x => x.Scenario == \"LR80\").Sum(x => x.Value).Should().BeApproximately(-55.01464, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -309,7 +309,7 @@
         {
             "cell_type": "code",
             "source": [
-                "pnl.Where(x => x.Scenario == \"LR70\").Sum(x => x.Value).Should().BeApproximately(15.00020, Precision);"
+                "pnl.Where(x => x.Scenario == \"LR70\").Sum(x => x.Value).Should().BeApproximately(15.00021, Precision);"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index 4bdef721..cf707188 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -1062,7 +1062,7 @@
                 "\n",
                 "\nThe Credit Default Rate values must be entered with monthly granularity, i.e. every value corresponds to the default rate for a certain month. The first month entered in column Values0 always corresponds to January of the year entered in column <code>Year</code>. The last value is considered valid also for the following years (for which no value has been provided). ",
                 "\n",
-                "\nThe latest Credit Default Rate available in the system with Year and Month earlier or equal to Year and Month of the closing period will be used as the current value during calculation. When the current period Credit Default Rate differs from previous period value, the analysis of change for the Credit Default Rate amount type computes the contribution of such update as an additional step (Credit Risk Update)."
+                "\nThe latest Credit Default Rate available in the system with Year and Month earlier or equal to Year and Month of the closing period will be used as the current value during calculation. When the current period Credit Default Rate differs from previous period value, the analysis of change for the Credit Default Rate amount type computes the contribution of such update as an additional step (Credit Risk Update). During calculation we approximate the Credit Default Rate to be constant over time as considering all projected values only accounts for marginal changes. "
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Import/2ImportScope-PresentValue.ipynb b/ifrs17/Import/2ImportScope-PresentValue.ipynb
index 080af179..e80eb964 100644
--- a/ifrs17/Import/2ImportScope-PresentValue.ipynb
+++ b/ifrs17/Import/2ImportScope-PresentValue.ipynb
@@ -249,6 +249,12 @@
                 "\n",
                 "\n$$",
                 "\n\\text{CDC}_i^{\\text{CDR}} = \\sum_{\\tau=i} \\big( \\text{Valid Discount}_{\\frac{i}{12}} \\big)^{\\tau-i+1} \\cdot \\text{Nominal}_\\tau^{\\text{Claim}} \\cdot \\big( e^{-\\gamma(\\tau-i)} -1 \\big)",
+                "\n$$",
+                "\n",
+                "\nwhere $\\gamma$ is the [yearly default rate](../DataModel/DataStructure#credit-default-rate) converted to monthly time step using: ",
+                "\n",
+                "\n$$",
+                "\n\\gamma = ( 1 + \\text{Credit Default Rate}) ^{\\frac{1}{12}} ~,",
                 "\n$$"
             ],
             "metadata": {},
diff --git a/ifrs17/Import/ImportStorage.ipynb b/ifrs17/Import/ImportStorage.ipynb
index 26630fe1..69084a9e 100644
--- a/ifrs17/Import/ImportStorage.ipynb
+++ b/ifrs17/Import/ImportStorage.ipynb
@@ -363,7 +363,7 @@
                 "\n        // if Partner == Internal then return 0;",
                 "\n        if(!PartnerRating.TryGetValue(dataNodeData.Partner, out var rating))                   ApplicationMessage.Log(Error.RatingNotFound, dataNodeData.Partner);",
                 "\n        if(!CreditDefaultRates.TryGetValue(rating[period].CreditRiskRating, out var rate))     ApplicationMessage.Log(Error.CreditDefaultRateNotFound, rating[period].CreditRiskRating);",
-                "\n        return rate[period].Values[0];",
+                "\n        return Math.Pow(1d + rate[period].Values[0], 1d / 12d) - 1d;",
                 "\n    }",
                 "\n    ",
                 "\n    public double GetPremiumAllocationFactor(ImportIdentity id) => SingleDataNodeParametersByGoc.TryGetValue(id.DataNode, out var singleDataNodeParameter) ",