diff --git a/ifrs17-template/Constants/CalculationEngine.ipynb b/ifrs17-template/Constants/CalculationEngine.ipynb
index 944705fa..7d011d96 100644
--- a/ifrs17-template/Constants/CalculationEngine.ipynb
+++ b/ifrs17-template/Constants/CalculationEngine.ipynb
@@ -22,7 +22,7 @@
                 "var projectName = \"ifrs17\";",
                 "\nvar environmentName = \"v1.3.1\";",
                 "\nvar notebookName = \"CalculationEngine\";",
-                "\nvar calculationEngine = $\"#!import \\\"//{projectName}/{environmentName}/{notebookName}\\\"\";"
+                "\nvar calculationEngine = $\"#!import \\\"../../{projectName}/{notebookName}\\\"\";"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Files/Dimensions.csv b/ifrs17-template/Files/Dimensions.csv
index e19aef07..890f37a5 100644
--- a/ifrs17-template/Files/Dimensions.csv
+++ b/ifrs17-template/Files/Dimensions.csv
@@ -122,7 +122,8 @@ LR,Loss Recovery Component,40,AoC,7,NotApplicable,,,,,,
 PL,Profit and Loss,50,None,7,NotApplicable,,,,,,
 AA,Advance Actuals,60,AoC,3,NotApplicable,,,,,,
 OA,Overdue Actuals,70,AoC,3,NotApplicable,,,,,,
-DA,Deferrable Actuals,80,AoC,7,NotApplicable,,,,,,
+DA,Deferrable,80,AoC,7,NotApplicable,,,,,,
+R,PAA Revenues,85,AoC,4,BeginningOfPeriod,,,,,,
 A,Actuals,90,None,2,NotApplicable,,,,,,
 F,Factors,100,None,4,NotApplicable,,,,,,
 BEPA,Best Estimate of Present Value To Csm,110,None,4,NotApplicable,,,,,,
diff --git a/ifrs17-template/Files/TransactionalData/Actuals_CH_2020_12.csv b/ifrs17-template/Files/TransactionalData/Actuals_CH_2020_12.csv
index a8d71374..38c22fb6 100644
--- a/ifrs17-template/Files/TransactionalData/Actuals_CH_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/Actuals_CH_2020_12.csv
@@ -1,25 +1,21 @@
 @@Main,,,,,
-ReportingNode,Year,Month,Scenario
+ReportingNode,Year,Month,Scenario,,
 CH,2020,12,,,
 @@Actual,,,,,
 DataNode,AocType,AmountType,EstimateType,AccidentYear,Value
 DT1.1,CF,PR,A,,400
 DT1.1,CF,NIC,A,,-280
-DT1.1,CF,ACA,A,,-10
-DT1.1,CF,AEA,A,,-5
+DT1.1,CF,DAE,A,,-140
 DT1.2,CF,NIC,A,2020,-280
 DT2.1,CF,PR,A,,400
 DT2.1,CF,NIC,A,,-280
-DT2.1,CF,ACA,A,,-10
-DT2.1,CF,AEA,A,,-5
+DT2.1,CF,DAE,A,,-140
 DT1.3,CF,PR,A,,400
 DT1.3,CF,NIC,A,,-280
-DT1.3,CF,ACA,A,,-10
-DT1.3,CF,AEA,A,,-5
+DT1.3,CF,DAE,A,,-140
 DT1.4,CF,PR,A,,400
 DT1.4,CF,NIC,A,,-280
-DT1.4,CF,ACA,A,,-10
-DT1.4,CF,AEA,A,,-5
+DT1.4,CF,DAE,A,,-140
 DT1.4,CF,PR,AA,,15
 DT1.4,CF,PR,OA,,-10
 DT1.4,CF,NIC,AA,,-5
@@ -33,16 +29,13 @@ DTR2.1,CF,NIC,A,,140
 DTR2.2,CF,NIC,A,2020,140
 DT3.1,CF,PR,A,,400
 DT3.1,CF,NIC,A,,-280
-DT3.1,CF,ACA,A,,-10
-DT3.1,CF,AEA,A,,-5
+DT3.1,CF,DAE,A,,-140
 DT4.1,CF,PR,A,,400
 DT4.1,CF,NIC,A,,-280
-DT4.1,CF,ACA,A,,-10
-DT4.1,CF,AEA,A,,-5
+DT4.1,CF,DAE,A,,-140
 DT1.5,CF,PR,A,,400
 DT1.5,CF,NIC,A,,-280
-DT1.5,CF,ACA,A,,-10
-DT1.5,CF,AEA,A,,-5
+DT1.5,CF,DAE,A,,-140
 DT1.5,CF,PR,OA,,-10
 DTR1.3,CF,PR,A,,-200
 DTR1.3,CF,NIC,A,,140
diff --git a/ifrs17-template/Files/TransactionalData/Actuals_CH_2021_3.csv b/ifrs17-template/Files/TransactionalData/Actuals_CH_2021_3.csv
index 666a3cb8..b0aa51a3 100644
--- a/ifrs17-template/Files/TransactionalData/Actuals_CH_2021_3.csv
+++ b/ifrs17-template/Files/TransactionalData/Actuals_CH_2021_3.csv
@@ -6,19 +6,16 @@ DataNode,AocType,AmountType,EstimateType,AccidentYear,Value
 DT1.1,CF,PR,A,,90
 DT1.1,CF,ICO,A,,-6
 DT1.1,CF,NIC,A,,-70
-DT1.1,CF,ACA,A,,-10
-DT1.1,CF,AEA,A,,-5
+DT1.1,CF,DAE,A,,-35
 DT1.2,CF,NIC,A,2020,-76
 DT1.3,CF,PR,A,,90
 DT1.3,CF,ICO,A,,-6
 DT1.3,CF,NIC,A,,-70
-DT1.3,CF,ACA,A,,-10
-DT1.3,CF,AEA,A,,-5
+DT1.3,CF,DAE,A,,-35
 DT2.1,CF,PR,A,,90
 DT2.1,CF,ICO,A,,-6
 DT2.1,CF,NIC,A,,-70
-DT2.1,CF,ACA,A,,-10
-DT2.1,CF,AEA,A,,-5
+DT2.1,CF,DAE,A,,-35
 DT2.2,CF,NIC,A,2020,-76
 DTR1.1,CF,PR,A,,-45
 DTR1.1,CF,NIC,A,,35
@@ -29,13 +26,11 @@ DTR2.2,CF,NIC,A,2020,35
 DT3.1,CF,PR,A,,90
 DT3.1,CF,ICO,A,,-6
 DT3.1,CF,NIC,A,,-70
-DT3.1,CF,ACA,A,,-10
-DT3.1,CF,AEA,A,,-5
+DT3.1,CF,DAE,A,,-35
 DT4.1,CF,PR,A,,90
 DT4.1,CF,ICO,A,,-6
 DT4.1,CF,NIC,A,,-70
-DT4.1,CF,ACA,A,,-10
-DT4.1,CF,AEA,A,,-5
+DT4.1,CF,DAE,A,,-35
 DT1.4,WO,PR,OA,,7
 DT1.4,WO,NIC,AA,,5
 DT1.4,CF,PR,AA,,5
@@ -44,14 +39,12 @@ DT1.4,CF,NIC,OA,,-8
 DT1.4,CF,PR,A,,90
 DT1.4,CF,ICO,A,,-6
 DT1.4,CF,NIC,A,,-70
-DT1.4,CF,ACA,A,,-10
-DT1.4,CF,AEA,A,,-5
+DT1.4,CF,DAE,A,,-35
 DT1.5,WO,PR,OA,,10
 DT1.5,CF,PR,A,,90
 DT1.5,CF,ICO,A,,-6
 DT1.5,CF,NIC,A,,-70
-DT1.5,CF,ACA,A,,-10
-DT1.5,CF,AEA,A,,-5
+DT1.5,CF,DAE,A,,-35
 DTR1.3,CF,PR,A,,-45
 DTR1.3,CF,NIC,A,,35
 DTR1.3,WO,PR,AA,,3.5
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv
index 19b59a59..4e9b1cd6 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv
@@ -4,13 +4,15 @@ CH,2020,12,,,,,,,,,,,,,,,,,,,,,,,,,,,
 @@Cashflow,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 DataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11,Values12,Values13,Values14,Values15,Values16,Values17,Values18,Values19,Values20,Values21,Values22,Values23
 DT1.1,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.1,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.1,NIC,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.1,CU,P,BOP,N,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.1,,RA,BOP,N,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT1.1,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.1,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.1,NIC,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.1,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
+DT1.1,DAE,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT1.1,DAE,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.2,NIC,BE,BOP,N,2020,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
 DT1.2,CU,P,BOP,N,2020,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.2,,RA,BOP,N,2020,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
@@ -18,19 +20,21 @@ DT1.2,NIC,BE,CL,C,2020,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-
 DT1.2,CU,P,CL,C,2020,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.2,,RA,CL,C,2020,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT1.3,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.3,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.3,NIC,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.3,CU,P,BOP,N,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.3,,RA,BOP,N,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
+DT1.3,DAE,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.3,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.3,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.3,NIC,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.3,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.3,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
+DT1.3,DAE,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT2.1,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT2.1,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT2.1,NIC,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT2.1,CU,P,BOP,N,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT2.1,,RA,BOP,N,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT2.1,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT2.1,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT2.1,NIC,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT2.1,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT2.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT2.2,NIC,BE,BOP,N,2020,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
@@ -68,35 +72,35 @@ DTR2.2,NIC,BE,CL,C,2020,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,1
 DTR2.2,CU,P,CL,C,2020,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5
 DTR2.2,,RA,CL,C,2020,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25
 DT3.1,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT3.1,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT3.1,NIC,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT3.1,CU,P,BOP,N,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT3.1,,RA,BOP,N,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT3.1,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT3.1,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT3.1,NIC,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT3.1,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT3.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT4.1,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT4.1,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT4.1,NIC,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT4.1,CU,P,BOP,N,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT4.1,,RA,BOP,N,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT4.1,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT4.1,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT4.1,NIC,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT4.1,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT4.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT1.4,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.4,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.4,NIC,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.4,CU,P,BOP,N,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.4,,RA,BOP,N,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT1.4,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.4,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.4,NIC,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.4,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.4,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT1.5,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.5,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.5,NIC,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.5,CU,P,BOP,N,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.5,,RA,BOP,N,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DT1.5,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0
-DT1.5,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
+DT1.5,NIC,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
 DT1.5,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DT1.5,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 DTR1.3,PR,BE,BOP,N,,-50,0,0,-50,0,0,-50,0,0,-50,0,0,0,-50,0,0,-50,0,0,-50,0,0,-50,0
@@ -115,3 +119,13 @@ DTR1.4,PR,BE,CL,C,,-50,0,0,-50,0,0,-50,0,0,-50,0,0,0,-50,0,0,-50,0,0,-50,0,0,-50
 DTR1.4,NIC,BE,CL,C,,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5
 DTR1.4,CU,P,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5
 DTR1.4,,RA,CL,C,,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25
+DT2.1,DAE,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT3.1,DAE,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT4.1,DAE,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT1.4,DAE,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT1.5,DAE,BE,BOP,N,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT2.1,DAE,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT3.1,DAE,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT4.1,DAE,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT1.4,DAE,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
+DT1.5,DAE,BE,CL,C,,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5,-12.5
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv
index 8975012d..5177debe 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv
@@ -4,20 +4,16 @@ CH,2021,3,,,,,,,,,,,,,,,,,,,,,,,,
 @@Cashflow,,,,,,,,,,,,,,,,,,,,,,,,,,
 DataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11,Values12,Values13,Values14,Values15,Values16,Values17,Values18,Values19,Values20
 DT1.1,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,0,0,0,0,0,0,0,0
-DT1.1,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
 DT1.1,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT1.1,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT1.1,PR,BE,BOP,N,,0,10,0,0,10,0,0,10,0,0,10,0,0,0,0,0,0,0,0,0,0
 DT1.1,ICO,BE,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.1,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,0,0,0,0,0,0,0,0,0
 DT1.1,,RA,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT1.1,PR,BE,EV,N,,0,5,0,0,5,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0
 DT1.1,ICO,BE,EV,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.1,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,0,0,0,0,0,0,0,0,0
 DT1.1,,RA,EV,N,,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,0,0,0,0,0,0,0,0,0
 DT1.1,PR,BE,CL,C,,0,115,0,0,115,0,0,115,0,0,115,0,0,0,0,0,0,0,0,0,0
 DT1.1,ICO,BE,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.1,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,0,0,0,0,0,0,0,0,0
 DT1.1,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
 DT1.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,0,0,0,0,0,0,0,0,0
 DT1.2,NIC,BE,MC,I,2020,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
@@ -31,37 +27,29 @@ DT1.2,NIC,BE,CL,C,2020,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,0,0,0,0,0
 DT1.2,CU,P,CL,C,2020,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
 DT1.2,,RA,CL,C,2020,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,0,0,0,0,0,0,0,0,0
 DT1.3,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,0,0,0,0,0,0,0,0
-DT1.3,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
 DT1.3,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT1.3,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT1.3,PR,BE,BOP,N,,0,10,0,0,10,0,0,10,0,0,10,0,0,0,0,0,0,0,0,0,0
 DT1.3,ICO,BE,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.3,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,0,0,0,0,0,0,0,0,0
 DT1.3,,RA,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT1.3,PR,BE,EV,N,,0,5,0,0,5,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0
 DT1.3,ICO,BE,EV,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.3,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,0,0,0,0,0,0,0,0,0
 DT1.3,,RA,EV,N,,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,0,0,0,0,0,0,0,0,0
 DT1.3,PR,BE,CL,C,,0,115,0,0,115,0,0,115,0,0,115,0,0,0,0,0,0,0,0,0,0
 DT1.3,ICO,BE,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.3,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,0,0,0,0,0,0,0,0,0
 DT1.3,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
 DT1.3,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,0,0,0,0,0,0,0,0,0
 DT2.1,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,0,0,0,0,0,0,0,0
-DT2.1,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
 DT2.1,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT2.1,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT2.1,PR,BE,BOP,N,,0,10,0,0,10,0,0,10,0,0,10,0,0,0,0,0,0,0,0,0,0
 DT2.1,ICO,BE,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT2.1,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,0,0,0,0,0,0,0,0,0
 DT2.1,,RA,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT2.1,PR,BE,EV,N,,0,5,0,0,5,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0
 DT2.1,ICO,BE,EV,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT2.1,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,0,0,0,0,0,0,0,0,0
 DT2.1,,RA,EV,N,,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,0,0,0,0,0,0,0,0,0
 DT2.1,PR,BE,CL,C,,0,115,0,0,115,0,0,115,0,0,115,0,0,0,0,0,0,0,0,0,0
 DT2.1,ICO,BE,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT2.1,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,0,0,0,0,0,0,0,0,0
 DT2.1,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
 DT2.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,0,0,0,0,0,0,0,0,0
 DT2.2,NIC,BE,MC,I,2020,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
@@ -123,71 +111,55 @@ DTR2.2,NIC,BE,CL,C,2020,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0
 DTR2.2,CU,P,CL,C,2020,-7.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-2.5,0,0,0,0,0,0,0,0,0
 DTR2.2,,RA,CL,C,2020,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,0,0,0,0,0,0,0,0,0
 DT3.1,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,0,0,0,0,0,0,0,0
-DT3.1,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
 DT3.1,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT3.1,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT3.1,PR,BE,BOP,N,,0,10,0,0,10,0,0,10,0,0,10,0,0,0,0,0,0,0,0,0,0
 DT3.1,ICO,BE,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT3.1,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,0,0,0,0,0,0,0,0,0
 DT3.1,,RA,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT3.1,PR,BE,EV,N,,0,5,0,0,5,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0
 DT3.1,ICO,BE,EV,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT3.1,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,0,0,0,0,0,0,0,0,0
 DT3.1,,RA,EV,N,,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,0,0,0,0,0,0,0,0,0
 DT3.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 DT3.1,ICO,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-DT3.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 DT3.1,CU,P,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 DT3.1,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 DT4.1,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,0,0,0,0,0,0,0,0
-DT4.1,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
 DT4.1,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT4.1,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT4.1,PR,BE,BOP,N,,0,20,0,0,20,0,0,20,0,0,20,0,0,0,0,0,0,0,0,0,0
 DT4.1,ICO,BE,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT4.1,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,0,0,0,0,0,0,0,0,0
 DT4.1,,RA,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT4.1,PR,BE,EV,N,,0,33,0,0,33,0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0
 DT4.1,ICO,BE,EV,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT4.1,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,0,0,0,0,0,0,0,0,0
 DT4.1,,RA,EV,N,,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,0,0,0,0,0,0,0,0,0
 DT4.1,PR,BE,CL,C,,0,143,0,0,143,0,0,143,0,0,143,0,0,0,0,0,0,0,0,0,0
 DT4.1,ICO,BE,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT4.1,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,0,0,0,0,0,0,0,0,0
 DT4.1,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
 DT4.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,0,0,0,0,0,0,0,0,0
 DT1.4,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,0,0,0,0,0,0,0,0
-DT1.4,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
 DT1.4,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT1.4,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT1.4,PR,BE,BOP,N,,0,10,0,0,10,0,0,10,0,0,10,0,0,0,0,0,0,0,0,0,0
 DT1.4,ICO,BE,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.4,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,0,0,0,0,0,0,0,0,0
 DT1.4,,RA,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT1.4,PR,BE,EV,N,,0,5,0,0,5,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0
 DT1.4,ICO,BE,EV,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.4,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,0,0,0,0,0,0,0,0,0
 DT1.4,,RA,EV,N,,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,0,0,0,0,0,0,0,0,0
 DT1.4,PR,BE,CL,C,,0,115,0,0,115,0,0,115,0,0,115,0,0,0,0,0,0,0,0,0,0
 DT1.4,ICO,BE,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.4,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,0,0,0,0,0,0,0,0,0
 DT1.4,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
 DT1.4,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,0,0,0,0,0,0,0,0,0
 DT1.5,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,0,0,0,0,0,0,0,0
-DT1.5,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,0,0,0,0,0,0,0,0,0
 DT1.5,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT1.5,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT1.5,PR,BE,BOP,N,,0,10,0,0,10,0,0,10,0,0,10,0,0,0,0,0,0,0,0,0,0
 DT1.5,ICO,BE,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.5,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,0,0,0,0,0,0,0,0,0
 DT1.5,,RA,BOP,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT1.5,PR,BE,EV,N,,0,5,0,0,5,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0
 DT1.5,ICO,BE,EV,N,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.5,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,0,0,0,0,0,0,0,0,0
 DT1.5,,RA,EV,N,,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,0,0,0,0,0,0,0,0,0
 DT1.5,PR,BE,CL,C,,0,115,0,0,115,0,0,115,0,0,115,0,0,0,0,0,0,0,0,0,0
 DT1.5,ICO,BE,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
-DT1.5,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,0,0,0,0,0,0,0,0,0
 DT1.5,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
 DT1.5,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,0,0,0,0,0,0,0,0,0
 DTR1.3,PR,BE,MC,I,,0,-55,0,0,-55,0,0,-55,0,0,-55,0,0,0,0,0,0,0,0,0,0
@@ -218,3 +190,59 @@ DTR1.4,PR,BE,CL,C,,0,-57.5,0,0,-57.5,0,0,-57.5,0,0,-57.5,0,0,0,0,0,0,0,0,0,0
 DTR1.4,NIC,BE,CL,C,,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0
 DTR1.4,CU,P,CL,C,,-7.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-3.5,-2.5,0,0,0,0,0,0,0,0,0
 DTR1.4,,RA,CL,C,,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,0,0,0,0,0,0,0,0,0
+DT1.1,NIC,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.1,NIC,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.1,NIC,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.1,NIC,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT1.3,NIC,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.3,NIC,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.3,NIC,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.3,NIC,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT2.1,NIC,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT2.1,NIC,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT2.1,NIC,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT2.1,NIC,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT3.1,NIC,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT3.1,NIC,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT3.1,NIC,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT3.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,
+DT4.1,NIC,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT4.1,NIC,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT4.1,NIC,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT4.1,NIC,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT1.4,NIC,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.4,NIC,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.4,NIC,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.4,NIC,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT1.5,NIC,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.5,NIC,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.5,NIC,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.5,NIC,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT1.1,DAE,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.1,DAE,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.1,DAE,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.1,DAE,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT1.3,DAE,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.3,DAE,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.3,DAE,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.3,DAE,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT2.1,DAE,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT2.1,DAE,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT2.1,DAE,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT2.1,DAE,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT3.1,DAE,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT3.1,DAE,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT3.1,DAE,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT3.1,DAE,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,
+DT4.1,DAE,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT4.1,DAE,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT4.1,DAE,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT4.1,DAE,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT1.4,DAE,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.4,DAE,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.4,DAE,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.4,DAE,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
+DT1.5,DAE,BE,MC,I,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,,,,,,,,,
+DT1.5,DAE,BE,BOP,N,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,,,,,,,,,
+DT1.5,DAE,BE,EV,N,,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,-4.5,,,,,,,,,
+DT1.5,DAE,BE,CL,C,,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,-14.5,,,,,,,,,
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv
index d12d2042..a283f965 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv
@@ -14,6 +14,7 @@ EY52BBA.2,NIC,BE,BOP,N,,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,
 EY52BBA.2,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 EY52BBA.2,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75
 EY52BBA.2,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+EY52PAA.1,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 EY52PAA.1,PR,BE,BOP,N,,2000,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY52PAA.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY57G.1,PR,BE,BOP,N,,1000,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
diff --git a/ifrs17-template/Files/TransactionalData/Openings_CH_2020_12.csv b/ifrs17-template/Files/TransactionalData/Openings_CH_2020_12.csv
index dab25bf9..d600a2fe 100644
--- a/ifrs17-template/Files/TransactionalData/Openings_CH_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/Openings_CH_2020_12.csv
@@ -6,3 +6,4 @@ DataNode,EstimateType,AmountType,AccidentYear,Value
 DT3.1,C,,,72.2
 DT3.1,AA,PR,,-1.5
 DT3.1,OA,PR,,1.5
+DT3.1,DA,,,-11.0
diff --git a/ifrs17-template/Files/TransactionalData/SimpleValue_CH_2020_12.csv b/ifrs17-template/Files/TransactionalData/SimpleValue_CH_2020_12.csv
index 4d80bce3..dcb7f9ee 100644
--- a/ifrs17-template/Files/TransactionalData/SimpleValue_CH_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/SimpleValue_CH_2020_12.csv
@@ -1,27 +1,27 @@
-@@Main
-Month,ReportingNode,Scenario,Year
-12,CH,,2020
-@@SimpleValue
+@@Main,,,,,,,
+Month,ReportingNode,Scenario,Year,,,,
+12,CH,,2020,,,,
+@@SimpleValue,,,,,,,
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,PR,BOP,DT5.1,L,BE,N,-798.536731161375
-,NIC,BOP,DT5.1,L,BE,N,598.7529445986629
-,PR,BOP,DT5.1,C,BE,N,-798.536731161375
-,NIC,BOP,DT5.1,C,BE,N,598.7529445986629
-,,BOP,DT5.1,C,RA,N,59.8752944598663
-,,BOP,DT5.1,L,RA,N,59.8752944598663
-,,AM,DT5.1,L,F,C,0.6562298579039588
-,PR,EOP,DT5.1,L,BE,C,-399.63392949885525
-,NIC,EOP,DT5.1,L,BE,C,299.67554969423594
-,PR,EOP,DT5.1,C,BE,C,-399.63392949885525
-,NIC,EOP,DT5.1,C,BE,C,299.67554969423594
-,,EOP,DT5.1,C,RA,C,29.967554969423595
-,,EOP,DT5.1,L,RA,C,29.967554969423595
-,PR,IA,DT5.1,L,BE,N,-1.0971983374806105
-,NIC,IA,DT5.1,L,BE,N,0.9226050955731167
-,PR,IA,DT5.1,C,BE,N,-1.0971983374806105
-,NIC,IA,DT5.1,C,BE,N,0.9226050955731167
-,,IA,DT5.1,C,RA,N,0.09226050955731169
-,,IA,DT5.1,L,RA,N,0.09226050955731169
+,PR,BOP,DT5.1,L,BE,N,-798.5367312
+,NIC,BOP,DT5.1,L,BE,N,598.7529446
+,PR,BOP,DT5.1,C,BE,N,-798.5367312
+,NIC,BOP,DT5.1,C,BE,N,598.7529446
+,,BOP,DT5.1,C,RA,N,59.87529446
+,,BOP,DT5.1,L,RA,N,59.87529446
+,,AM,DT5.1,L,F,C,0.656229858
+,PR,EOP,DT5.1,L,BE,C,-399.6339295
+,NIC,EOP,DT5.1,L,BE,C,299.6755497
+,PR,EOP,DT5.1,C,BE,C,-399.6339295
+,NIC,EOP,DT5.1,C,BE,C,299.6755497
+,,EOP,DT5.1,C,RA,C,29.96755497
+,,EOP,DT5.1,L,RA,C,29.96755497
+,PR,IA,DT5.1,L,BE,N,-1.097198337
+,NIC,IA,DT5.1,L,BE,N,0.922605096
+,PR,IA,DT5.1,C,BE,N,-1.097198337
+,NIC,IA,DT5.1,C,BE,N,0.922605096
+,,IA,DT5.1,C,RA,N,0.09226051
+,,IA,DT5.1,L,RA,N,0.09226051
 ,PR,CF,DT5.1,L,BE,N,400
 ,NIC,CF,DT5.1,L,BE,N,-300
 ,PR,CF,DT5.1,C,BE,N,400
@@ -34,11 +34,12 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,ACA,CF,DT5.1,,A,C,-10
 ,AEA,CF,DT5.1,,A,C,-5
 ,PR,CF,DT5.1,,APA,C,320
-,,CF,DT5.1,,DA,C,-15
+,,BOP,DT5.1,,DA,N,-15
 ,,EA,DT5.1,,C,C,-15
-,,AM,DT5.1,,DA,C,9.843447868559382
-,,AM,DT5.1,,C,C,-82.02271122089925
-,,EOP,DT5.1,,DA,C,-5.156552131440618
-,,EOP,DT5.1,,C,C,42.9681136142967
-,,BOP,DT5.1,,C,N,139.90849210284577
-,,IA,DT5.1,,C,N,0.08233273235018213
\ No newline at end of file
+,,AM,DT5.1,,DA,C,9.85821304
+,,AM,DT5.1,,C,C,-82.02271122
+,,EOP,DT5.1,,DA,C,-5.16428696
+,,EOP,DT5.1,,C,C,42.96811361
+,,BOP,DT5.1,,C,N,139.9084921
+,,IA,DT5.1,,C,N,0.082332732
+,,IA,DT5.1,,DA,N,-0.0225
diff --git a/ifrs17-template/Import/InteractWithImportScopes/EvaluateImportScopes.ipynb b/ifrs17-template/Import/InteractWithImportScopes/EvaluateImportScopes.ipynb
index aa205240..09cabff5 100644
--- a/ifrs17-template/Import/InteractWithImportScopes/EvaluateImportScopes.ipynb
+++ b/ifrs17-template/Import/InteractWithImportScopes/EvaluateImportScopes.ipynb
@@ -289,15 +289,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "var ivs = Scopes.ForIdentities(identities.Select(id => id with {ProjectionPeriod = projection}), storage).ToScopes<DeferrableAmortizationFactorToIfrsVariable>().SelectMany(x => x.DeferrableAmFactor).ToArray();"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
@@ -339,7 +330,7 @@
             "source": [
                 "var iv = Enumerable.Range(0,5).SelectMany(p=>",
                 "\n    Scopes.ForIdentities(identities.Select(id => id with {ProjectionPeriod=p}), storage)",
-                "\n    .ToScopes<DeferrableCashflowToIfrsVariable>().SelectMany(x => x.Deferrable))",
+                "\n    .ToScopes<DeferrableToIfrsVariable>().SelectMany(x => x.Deferrable))",
                 "\n.AggregateProjections().Where(x => x.Values.Any(v => Math.Abs(v) > Precision ))",
                 "\n.ToArray();",
                 "\n",
diff --git a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2020_12.csv b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2020_12.csv
index c2a4d4f1..c6a699e3 100644
--- a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2020_12.csv
+++ b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2020_12.csv
@@ -24,16 +24,18 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,MZ1.2,L,BE,N,-487.82037
 ,PR,CF,MZ1.2,L,BE,N,400
 ,PR,IA,MZ1.2,L,BE,N,-218.37965
-,PR,CF,MZ1.2,L,BEPA,N,320
-,,AM,MZ1.2,,C,C,-95.78552
-,,EA,MZ1.2,,C,C,-15
-,,EOP,MZ1.2,,C,C,25.21326
-,,BOP,MZ1.2,,C,N,117.78063
-,,IA,MZ1.2,,C,N,18.21816
-,,AM,MZ1.2,,DA,C,11.87436
-,,CF,MZ1.2,,DA,C,-15
-,,EOP,MZ1.2,,DA,C,-3.12564
-,,AM,MZ1.2,L,F,C,0.79162
+,NIC,EOP,MZ1.2,N,BE,C,300
+,NIC,BOP,MZ1.2,N,BE,N,600
+,NIC,CF,MZ1.2,N,BE,N,-300
+,PR,EOP,MZ1.2,N,BE,C,-400
+,PR,BOP,MZ1.2,N,BE,N,-800
+,PR,CF,MZ1.2,N,BE,N,400
+,PR,CF,MZ1.2,N,BEPA,N,320
+,,AM,MZ1.2,L,C,C,-107.65988
+,,EOP,MZ1.2,L,C,C,28.33891
+,,BOP,MZ1.2,L,C,N,117.78063
+,,IA,MZ1.2,L,C,N,18.21816
+,CU,AM,MZ1.2,L,F,C,0.79162
 ,,EOP,MZ1.2,C,RA,C,21.83648
 ,,BOP,MZ1.2,C,RA,N,33.63998
 ,,CF,MZ1.2,C,RA,N,-30
@@ -42,3 +44,6 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,,BOP,MZ1.2,L,RA,N,33.63998
 ,,CF,MZ1.2,L,RA,N,-30
 ,,IA,MZ1.2,L,RA,N,18.1965
+,,EOP,MZ1.2,N,RA,C,30
+,,BOP,MZ1.2,N,RA,N,60
+,,CF,MZ1.2,N,RA,N,-30
diff --git a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2021_3.csv b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2021_3.csv
index 5396e3aa..89db75eb 100644
--- a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2021_3.csv
+++ b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/SimpleValue_CsmSwitch_CH_2021_3.csv
@@ -53,25 +53,36 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,MZ1.2,L,BE,N,10
 ,PR,EV,MZ1.2,L,BE,N,12.31548
 ,PR,IA,MZ1.2,L,BE,N,-4.01096
-,PR,CF,MZ1.2,L,BEPA,I,88
-,PR,CF,MZ1.2,L,BEPA,N,8
-,,AM,MZ1.2,,C,C,-3.97038
-,,CL,MZ1.2,,C,C,-69.45932
-,,EA,MZ1.2,,C,C,-42
-,,EOP,MZ1.2,,C,C,5.71314
-,,BOP,MZ1.2,,C,I,25.21326
-,,IA,MZ1.2,,C,I,17.26933
-,,MC,MZ1.2,,C,I,78.66025
-,,AM,MZ1.2,,DA,C,7.43177
-,,CF,MZ1.2,,DA,C,-15
-,,EOP,MZ1.2,,DA,C,-10.69387
-,,BOP,MZ1.2,,DA,I,-3.12564
-,,AM,MZ1.2,L,F,C,0.41001
-,,CL,MZ1.2,,C,C,69.45932
-,,BOP,MZ1.2,,C,N,-21.78754
-,,EV,MZ1.2,,C,N,-43.93326
-,,IA,MZ1.2,,C,N,-3.73853
+,ICO,EOP,MZ1.2,N,BE,C,9
+,ICO,BOP,MZ1.2,N,BE,N,12
+,ICO,CF,MZ1.2,N,BE,N,-3
+,NIC,EOP,MZ1.2,N,BE,C,261
+,NIC,BOP,MZ1.2,N,BE,I,300
+,NIC,CF,MZ1.2,N,BE,I,-60
+,NIC,MC,MZ1.2,N,BE,I,-60
+,NIC,BOP,MZ1.2,N,BE,N,48
+,NIC,CF,MZ1.2,N,BE,N,-12
+,NIC,EV,MZ1.2,N,BE,N,45
+,PR,EOP,MZ1.2,N,BE,C,-345
+,PR,BOP,MZ1.2,N,BE,I,-400
+,PR,CF,MZ1.2,N,BE,I,110
+,PR,MC,MZ1.2,N,BE,I,-40
+,PR,BOP,MZ1.2,N,BE,N,-40
+,PR,CF,MZ1.2,N,BE,N,10
+,PR,EV,MZ1.2,N,BE,N,15
+,PR,CF,MZ1.2,N,BEPA,I,88
+,PR,CF,MZ1.2,N,BEPA,N,8
+,,AM,MZ1.2,L,C,C,-11.61521
+,,EA,MZ1.2,L,C,C,-27
+,,EOP,MZ1.2,L,C,C,16.7136
+,,BOP,MZ1.2,L,C,I,28.33891
+,,IA,MZ1.2,L,C,I,17.78898
+,,MC,MZ1.2,L,C,I,78.66025
+,,BOP,MZ1.2,L,C,N,-21.78754
+,,EV,MZ1.2,L,C,N,-43.93326
+,,IA,MZ1.2,L,C,N,-3.73853
 ,,EOP,MZ1.2,C,RA,C,17.56543
+,CU,AM,MZ1.2,L,F,C,0.41001
 ,,BOP,MZ1.2,C,RA,I,21.83648
 ,,CF,MZ1.2,C,RA,I,-6
 ,,IA,MZ1.2,C,RA,I,2.58316
@@ -89,3 +100,10 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,,CF,MZ1.2,L,RA,N,-3
 ,,EV,MZ1.2,L,RA,N,-3.51309
 ,,IA,MZ1.2,L,RA,N,1.29158
+,,EOP,MZ1.2,N,RA,C,22.5
+,,BOP,MZ1.2,N,RA,I,30
+,,CF,MZ1.2,N,RA,I,-6
+,,MC,MZ1.2,N,RA,I,-6
+,,BOP,MZ1.2,N,RA,N,12
+,,CF,MZ1.2,N,RA,N,-3
+,,EV,MZ1.2,N,RA,N,-4.5
diff --git a/ifrs17-template/Report/Reports.ipynb b/ifrs17-template/Report/Reports.ipynb
index fb4086a5..40148bf5 100644
--- a/ifrs17-template/Report/Reports.ipynb
+++ b/ifrs17-template/Report/Reports.ipynb
@@ -204,9 +204,9 @@
         {
             "cell_type": "markdown",
             "source": [
-                "## Deferrable Actuals",
+                "## Deferrable Expenses",
                 "\n",
-                "\n[Deferrable Actuals](https://portal.systemorph.cloud/project/ifrs17/env/v1.3.1/Report/ReportScopes#written-accrual-deferral) are shown here. Amortization of the deferrable amount is computed using the Coverage Unit pattern.  "
+                "\n[Deferrable Expenses](https://portal.systemorph.cloud/project/ifrs17/env/v1.3.1/Report/ReportScopes#written-accrual-deferral) are shown here. Amortization of the deferrable amount can be computed using a dedicated pattern for Deferrable Expense, the Coverage Unit pattern, or a generic pattern. In this example we the Coverage Unit pattern is used."
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Test/Data/ExportIfrsVariable.ipynb b/ifrs17-template/Test/Data/ExportIfrsVariable.ipynb
index f91e7ace..3b21f958 100644
--- a/ifrs17-template/Test/Data/ExportIfrsVariable.ipynb
+++ b/ifrs17-template/Test/Data/ExportIfrsVariable.ipynb
@@ -65,20 +65,20 @@
         {
             "cell_type": "code",
             "source": [
-                "ProjectionCount = 5;",
-                "\nvar activity1 = await Import.FromFile(\"../../Files/TransactionalData/NominalCashflows_CH_2020_12_Projection.csv\")",
-                "\n            .WithFormat(ImportFormats.Cashflow)",
-                "\n            .WithTarget(DataSource)",
-                "\n            .WithActivityLog()",
-                "\n            .ExecuteAsync();",
-                "\nProjectionCount = 11;",
-                "\nvar activity2 = await Import.FromFile(\"../../Files/TransactionalData/NominalCashflows_CH_2021_3_Projection.csv\")",
-                "\n            .WithFormat(ImportFormats.Cashflow)",
-                "\n            .WithTarget(DataSource)",
-                "\n            .WithActivityLog()",
-                "\n            .ExecuteAsync();",
-                "\nProjectionCount = 1;",
-                "\n(Activity1: activity1.Status, Errors1:activity1.Errors, Activity2:activity2.Status, Errors2:activity2.Errors)"
+                "// ProjectionCount = 5;",
+                "\n// var activity1 = await Import.FromFile(\"../../Files/TransactionalData/NominalCashflows_CH_2020_12_Projection.csv\")",
+                "\n//             .WithFormat(ImportFormats.Cashflow)",
+                "\n//             .WithTarget(DataSource)",
+                "\n//             .WithActivityLog()",
+                "\n//             .ExecuteAsync();",
+                "\n// ProjectionCount = 11;",
+                "\n// var activity2 = await Import.FromFile(\"../../Files/TransactionalData/NominalCashflows_CH_2021_3_Projection.csv\")",
+                "\n//             .WithFormat(ImportFormats.Cashflow)",
+                "\n//             .WithTarget(DataSource)",
+                "\n//             .WithActivityLog()",
+                "\n//             .ExecuteAsync();",
+                "\n// ProjectionCount = 1;",
+                "\n// (Activity1: activity1.Status, Errors1:activity1.Errors, Activity2:activity2.Status, Errors2:activity2.Errors)"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -154,7 +154,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var args = new ImportArgs (\"CH\", 2021, 3, (Periodicity)default, null, null);",
+                "var args = new ImportArgs (\"CH\", 2020, 12, (Periodicity)default, null, null);",
                 "\nargs"
             ],
             "metadata": {},
@@ -166,7 +166,7 @@
             "source": [
                 "await DataSource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(new {ReportingNode = args.ReportingNode, Year = args.Year, Month = args.Month, Scenario = args.Scenario});",
                 "\nvar ifrsVariables = (await DataSource.Query<IfrsVariable>().ToArrayAsync())",
-                "\n            .Where(x => x.DataNode == \"DTP1.1\") //Extra Filter",
+                "\n            //.Where(x => x.DataNode == \"DTP1.1\") //Extra Filter",
                 "\n            .Select(v => v with {Values = v.Values.Select(x => Math.Round(x, roundingDigits)).ToArray()})",
                 "\n            .OrderBy(v => v.DataNode).ThenBy(v => v.AccidentYear).ThenBy(v => v.EstimateType).ThenBy(v => v.EconomicBasis).ThenBy(v => v.AmountType).ThenBy(v => (v.AocType, v.Novelty))",
                 "\n            .ThenBy(v => v.AocType)",
@@ -248,7 +248,7 @@
         {
             "cell_type": "code",
             "source": [
-                "string benchmarkFileNameSuffix = \"Projection_DTP\";"
+                "string benchmarkFileNameSuffix = null;//\"Projection_DTP\";"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -257,7 +257,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var estimateType = EstimateTypes.BE;"
+                "var estimateType = EstimateTypes.DA;"
             ],
             "metadata": {},
             "execution_count": 0,
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 86409710..08abce27 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
@@ -3,10 +3,11 @@ Month,ReportingNode,Scenario,Year
 12,CH,MTUP10pct,2020
 @@C
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,,AM,DT1.1,L,C,C,-42.67021
-,,EOP,DT1.1,L,C,C,22.35306
-,,BOP,DT1.1,L,C,N,80.0332
-,,IA,DT1.1,L,C,N,-0.00993
+,,AM,DT1.1,L,C,C,0
+,,EA,DT1.1,L,C,C,0
+,,EOP,DT1.1,L,C,C,0
+,,BOP,DT1.1,L,C,N,0
+,,IA,DT1.1,L,C,N,0
 ,,AM,DTR1.1,L,C,C,26.28586
 ,,EOP,DTR1.1,L,C,C,-13.77001
 ,,BOP,DTR1.1,L,C,N,-40.06074
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_L.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_L.csv
new file mode 100644
index 00000000..b61c04c3
--- /dev/null
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_L.csv
@@ -0,0 +1,10 @@
+@@Main
+Month,ReportingNode,Scenario,Year
+12,CH,MTUP10pct,2020
+@@L
+AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
+,,AM,DT1.1,L,L,C,-137.68654
+,,EA,DT1.1,L,L,C,-10
+,,EOP,DT1.1,L,L,C,72.12796
+,,BOP,DT1.1,L,L,N,219.34327
+,,IA,DT1.1,L,L,N,0.47123
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_LR.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_LR.csv
new file mode 100644
index 00000000..9dccd7ed
--- /dev/null
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_MTUP10pct_LR.csv
@@ -0,0 +1,10 @@
+@@Main
+Month,ReportingNode,Scenario,Year
+12,CH,MTUP10pct,2020
+@@LR
+AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
+,,AM,DTR1.1,L,LR,C,68.84327
+,,EA,DTR1.1,L,LR,C,4.76925
+,,EOP,DTR1.1,L,LR,C,-36.06398
+,,BOP,DTR1.1,L,LR,N,-109.67164
+,,IA,DTR1.1,L,LR,N,-0.00487
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__A.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__A.csv
index dba606f2..67c1d037 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__A.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__A.csv
@@ -3,47 +3,40 @@ Month,ReportingNode,Scenario,Year
 12,CH,,2020
 @@A
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,NIC,CF,DTR1.1,,A,C,140
-,PR,CF,DTR1.1,,A,C,-200
-2020,NIC,CF,DT2.2,,A,C,-280
-,PR,CF,DT1.1,,A,C,400
+,DAE,CF,DT1.1,,A,C,-140
 ,NIC,CF,DT1.1,,A,C,-280
-,ACA,CF,DT1.1,,A,C,-10
-,AEA,CF,DT1.1,,A,C,-5
+,PR,CF,DT1.1,,A,C,400
 2020,NIC,CF,DT1.2,,A,C,-280
-,PR,CF,DT2.1,,A,C,400
-,NIC,CF,DT2.1,,A,C,-280
-,ACA,CF,DT2.1,,A,C,-10
-,AEA,CF,DT2.1,,A,C,-5
-,PR,CF,DT1.3,,A,C,400
+,DAE,CF,DT1.3,,A,C,-140
 ,NIC,CF,DT1.3,,A,C,-280
-,ACA,CF,DT1.3,,A,C,-10
-,AEA,CF,DT1.3,,A,C,-5
-,PR,CF,DT1.4,,A,C,400
+,PR,CF,DT1.3,,A,C,400
+,DAE,CF,DT1.4,,A,C,-140
 ,NIC,CF,DT1.4,,A,C,-280
-,ACA,CF,DT1.4,,A,C,-10
-,AEA,CF,DT1.4,,A,C,-5
-2020,NIC,CF,DTR1.2,,A,C,140
-,PR,CF,DTR2.1,,A,C,-200
-,NIC,CF,DTR2.1,,A,C,140
-2020,NIC,CF,DTR2.2,,A,C,140
-,PR,CF,DT3.1,,A,C,400
+,PR,CF,DT1.4,,A,C,400
+,DAE,CF,DT1.5,,A,C,-140
+,NIC,CF,DT1.5,,A,C,-280
+,PR,CF,DT1.5,,A,C,400
+,DAE,CF,DT2.1,,A,C,-140
+,NIC,CF,DT2.1,,A,C,-280
+,PR,CF,DT2.1,,A,C,400
+2020,NIC,CF,DT2.2,,A,C,-280
+,DAE,CF,DT3.1,,A,C,-140
 ,NIC,CF,DT3.1,,A,C,-280
-,ACA,CF,DT3.1,,A,C,-10
-,AEA,CF,DT3.1,,A,C,-5
-,PR,CF,DT4.1,,A,C,400
+,PR,CF,DT3.1,,A,C,400
+,DAE,CF,DT4.1,,A,C,-140
 ,NIC,CF,DT4.1,,A,C,-280
-,ACA,CF,DT4.1,,A,C,-10
-,AEA,CF,DT4.1,,A,C,-5
-,PR,CF,DT1.5,,A,C,400
-,NIC,CF,DT1.5,,A,C,-280
-,ACA,CF,DT1.5,,A,C,-10
-,AEA,CF,DT1.5,,A,C,-5
-,PR,CF,DTR1.3,,A,C,-200
+,PR,CF,DT4.1,,A,C,400
+,ACA,CF,DT5.1,,A,C,-10
+,AEA,CF,DT5.1,,A,C,-5
+,NIC,CF,DT5.1,,A,C,-280
+,PR,CF,DT5.1,,A,C,400
+,NIC,CF,DTR1.1,,A,C,140
+,PR,CF,DTR1.1,,A,C,-200
+2020,NIC,CF,DTR1.2,,A,C,140
 ,NIC,CF,DTR1.3,,A,C,140
-,PR,CF,DTR1.4,,A,C,-200
+,PR,CF,DTR1.3,,A,C,-200
 ,NIC,CF,DTR1.4,,A,C,140
-,PR,CF,DT5.1,,A,C,400
-,NIC,CF,DT5.1,,A,C,-280
-,ACA,CF,DT5.1,,A,C,-10
-,AEA,CF,DT5.1,,A,C,-5
\ No newline at end of file
+,PR,CF,DTR1.4,,A,C,-200
+,NIC,CF,DTR2.1,,A,C,140
+,PR,CF,DTR2.1,,A,C,-200
+2020,NIC,CF,DTR2.2,,A,C,140
\ 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 bb27e5a3..961d2cc3 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
@@ -3,25 +3,36 @@ Month,ReportingNode,Scenario,Year
 12,CH,,2020
 @@BE
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,NIC,EOP,DT1.1,C,BE,C,299.67555
-,NIC,BOP,DT1.1,C,BE,N,598.75294
-,NIC,CF,DT1.1,C,BE,N,-300
-,NIC,IA,DT1.1,C,BE,N,0.92261
+,DAE,EOP,DT1.1,C,BE,C,149.83777
+,DAE,BOP,DT1.1,C,BE,N,299.37647
+,DAE,CF,DT1.1,C,BE,N,-150
+,DAE,IA,DT1.1,C,BE,N,0.4613
+,NIC,EOP,DT1.1,C,BE,C,149.83777
+,NIC,BOP,DT1.1,C,BE,N,299.37647
+,NIC,CF,DT1.1,C,BE,N,-150
+,NIC,IA,DT1.1,C,BE,N,0.4613
 ,PR,EOP,DT1.1,C,BE,C,-399.63393
 ,PR,BOP,DT1.1,C,BE,N,-798.53673
 ,PR,CF,DT1.1,C,BE,N,400
 ,PR,IA,DT1.1,C,BE,N,-1.0972
-,NIC,EOP,DT1.1,L,BE,C,299.67555
-,NIC,BOP,DT1.1,L,BE,N,598.75294
-,NIC,CF,DT1.1,L,BE,N,-300
-,NIC,IA,DT1.1,L,BE,N,0.92261
+,DAE,EOP,DT1.1,L,BE,C,149.83777
+,DAE,BOP,DT1.1,L,BE,N,299.37647
+,DAE,CF,DT1.1,L,BE,N,-150
+,DAE,IA,DT1.1,L,BE,N,0.4613
+,NIC,EOP,DT1.1,L,BE,C,149.83777
+,NIC,BOP,DT1.1,L,BE,N,299.37647
+,NIC,CF,DT1.1,L,BE,N,-150
+,NIC,IA,DT1.1,L,BE,N,0.4613
 ,PR,EOP,DT1.1,L,BE,C,-399.63393
 ,PR,BOP,DT1.1,L,BE,N,-798.53673
 ,PR,CF,DT1.1,L,BE,N,400
 ,PR,IA,DT1.1,L,BE,N,-1.0972
-,NIC,EOP,DT1.1,N,BE,C,300
-,NIC,BOP,DT1.1,N,BE,N,600
-,NIC,CF,DT1.1,N,BE,N,-300
+,DAE,EOP,DT1.1,N,BE,C,150
+,DAE,BOP,DT1.1,N,BE,N,300
+,DAE,CF,DT1.1,N,BE,N,-150
+,NIC,EOP,DT1.1,N,BE,C,150
+,NIC,BOP,DT1.1,N,BE,N,300
+,NIC,CF,DT1.1,N,BE,N,-150
 ,PR,EOP,DT1.1,N,BE,C,-400
 ,PR,BOP,DT1.1,N,BE,N,-800
 ,PR,CF,DT1.1,N,BE,N,400
@@ -36,91 +47,135 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,EOP,DT1.2,N,BE,C,300
 2020,NIC,BOP,DT1.2,N,BE,N,600
 2020,NIC,CF,DT1.2,N,BE,N,-300
-,NIC,EOP,DT1.3,C,BE,C,299.67555
-,NIC,BOP,DT1.3,C,BE,N,598.75294
-,NIC,CF,DT1.3,C,BE,N,-300
-,NIC,IA,DT1.3,C,BE,N,0.92261
+,DAE,EOP,DT1.3,C,BE,C,149.83777
+,DAE,BOP,DT1.3,C,BE,N,299.37647
+,DAE,CF,DT1.3,C,BE,N,-150
+,DAE,IA,DT1.3,C,BE,N,0.4613
+,NIC,EOP,DT1.3,C,BE,C,149.83777
+,NIC,BOP,DT1.3,C,BE,N,299.37647
+,NIC,CF,DT1.3,C,BE,N,-150
+,NIC,IA,DT1.3,C,BE,N,0.4613
 ,PR,EOP,DT1.3,C,BE,C,-399.63393
 ,PR,BOP,DT1.3,C,BE,N,-798.53673
 ,PR,CF,DT1.3,C,BE,N,400
 ,PR,IA,DT1.3,C,BE,N,-1.0972
-,NIC,EOP,DT1.3,L,BE,C,299.67555
-,NIC,BOP,DT1.3,L,BE,N,598.75294
-,NIC,CF,DT1.3,L,BE,N,-300
-,NIC,IA,DT1.3,L,BE,N,0.92261
+,DAE,EOP,DT1.3,L,BE,C,149.83777
+,DAE,BOP,DT1.3,L,BE,N,299.37647
+,DAE,CF,DT1.3,L,BE,N,-150
+,DAE,IA,DT1.3,L,BE,N,0.4613
+,NIC,EOP,DT1.3,L,BE,C,149.83777
+,NIC,BOP,DT1.3,L,BE,N,299.37647
+,NIC,CF,DT1.3,L,BE,N,-150
+,NIC,IA,DT1.3,L,BE,N,0.4613
 ,PR,EOP,DT1.3,L,BE,C,-399.63393
 ,PR,BOP,DT1.3,L,BE,N,-798.53673
 ,PR,CF,DT1.3,L,BE,N,400
 ,PR,IA,DT1.3,L,BE,N,-1.0972
-,NIC,EOP,DT1.3,N,BE,C,300
-,NIC,BOP,DT1.3,N,BE,N,600
-,NIC,CF,DT1.3,N,BE,N,-300
+,DAE,EOP,DT1.3,N,BE,C,150
+,DAE,BOP,DT1.3,N,BE,N,300
+,DAE,CF,DT1.3,N,BE,N,-150
+,NIC,EOP,DT1.3,N,BE,C,150
+,NIC,BOP,DT1.3,N,BE,N,300
+,NIC,CF,DT1.3,N,BE,N,-150
 ,PR,EOP,DT1.3,N,BE,C,-400
 ,PR,BOP,DT1.3,N,BE,N,-800
 ,PR,CF,DT1.3,N,BE,N,400
-,NIC,EOP,DT1.4,C,BE,C,299.67555
-,NIC,BOP,DT1.4,C,BE,N,598.75294
-,NIC,CF,DT1.4,C,BE,N,-300
-,NIC,IA,DT1.4,C,BE,N,0.92261
+,DAE,EOP,DT1.4,C,BE,C,149.83777
+,DAE,BOP,DT1.4,C,BE,N,299.37647
+,DAE,CF,DT1.4,C,BE,N,-150
+,DAE,IA,DT1.4,C,BE,N,0.4613
+,NIC,EOP,DT1.4,C,BE,C,149.83777
+,NIC,BOP,DT1.4,C,BE,N,299.37647
+,NIC,CF,DT1.4,C,BE,N,-150
+,NIC,IA,DT1.4,C,BE,N,0.4613
 ,PR,EOP,DT1.4,C,BE,C,-399.63393
 ,PR,BOP,DT1.4,C,BE,N,-798.53673
 ,PR,CF,DT1.4,C,BE,N,400
 ,PR,IA,DT1.4,C,BE,N,-1.0972
-,NIC,EOP,DT1.4,L,BE,C,299.67555
-,NIC,BOP,DT1.4,L,BE,N,598.75294
-,NIC,CF,DT1.4,L,BE,N,-300
-,NIC,IA,DT1.4,L,BE,N,0.92261
+,DAE,EOP,DT1.4,L,BE,C,149.83777
+,DAE,BOP,DT1.4,L,BE,N,299.37647
+,DAE,CF,DT1.4,L,BE,N,-150
+,DAE,IA,DT1.4,L,BE,N,0.4613
+,NIC,EOP,DT1.4,L,BE,C,149.83777
+,NIC,BOP,DT1.4,L,BE,N,299.37647
+,NIC,CF,DT1.4,L,BE,N,-150
+,NIC,IA,DT1.4,L,BE,N,0.4613
 ,PR,EOP,DT1.4,L,BE,C,-399.63393
 ,PR,BOP,DT1.4,L,BE,N,-798.53673
 ,PR,CF,DT1.4,L,BE,N,400
 ,PR,IA,DT1.4,L,BE,N,-1.0972
-,NIC,EOP,DT1.4,N,BE,C,300
-,NIC,BOP,DT1.4,N,BE,N,600
-,NIC,CF,DT1.4,N,BE,N,-300
+,DAE,EOP,DT1.4,N,BE,C,150
+,DAE,BOP,DT1.4,N,BE,N,300
+,DAE,CF,DT1.4,N,BE,N,-150
+,NIC,EOP,DT1.4,N,BE,C,150
+,NIC,BOP,DT1.4,N,BE,N,300
+,NIC,CF,DT1.4,N,BE,N,-150
 ,PR,EOP,DT1.4,N,BE,C,-400
 ,PR,BOP,DT1.4,N,BE,N,-800
 ,PR,CF,DT1.4,N,BE,N,400
-,NIC,EOP,DT1.5,C,BE,C,299.67555
-,NIC,BOP,DT1.5,C,BE,N,598.75294
-,NIC,CF,DT1.5,C,BE,N,-300
-,NIC,IA,DT1.5,C,BE,N,0.92261
+,DAE,EOP,DT1.5,C,BE,C,149.83777
+,DAE,BOP,DT1.5,C,BE,N,299.37647
+,DAE,CF,DT1.5,C,BE,N,-150
+,DAE,IA,DT1.5,C,BE,N,0.4613
+,NIC,EOP,DT1.5,C,BE,C,149.83777
+,NIC,BOP,DT1.5,C,BE,N,299.37647
+,NIC,CF,DT1.5,C,BE,N,-150
+,NIC,IA,DT1.5,C,BE,N,0.4613
 ,PR,EOP,DT1.5,C,BE,C,-399.63393
 ,PR,BOP,DT1.5,C,BE,N,-798.53673
 ,PR,CF,DT1.5,C,BE,N,400
 ,PR,IA,DT1.5,C,BE,N,-1.0972
-,NIC,EOP,DT1.5,L,BE,C,299.67555
-,NIC,BOP,DT1.5,L,BE,N,598.75294
-,NIC,CF,DT1.5,L,BE,N,-300
-,NIC,IA,DT1.5,L,BE,N,0.92261
+,DAE,EOP,DT1.5,L,BE,C,149.83777
+,DAE,BOP,DT1.5,L,BE,N,299.37647
+,DAE,CF,DT1.5,L,BE,N,-150
+,DAE,IA,DT1.5,L,BE,N,0.4613
+,NIC,EOP,DT1.5,L,BE,C,149.83777
+,NIC,BOP,DT1.5,L,BE,N,299.37647
+,NIC,CF,DT1.5,L,BE,N,-150
+,NIC,IA,DT1.5,L,BE,N,0.4613
 ,PR,EOP,DT1.5,L,BE,C,-399.63393
 ,PR,BOP,DT1.5,L,BE,N,-798.53673
 ,PR,CF,DT1.5,L,BE,N,400
 ,PR,IA,DT1.5,L,BE,N,-1.0972
-,NIC,EOP,DT1.5,N,BE,C,300
-,NIC,BOP,DT1.5,N,BE,N,600
-,NIC,CF,DT1.5,N,BE,N,-300
+,DAE,EOP,DT1.5,N,BE,C,150
+,DAE,BOP,DT1.5,N,BE,N,300
+,DAE,CF,DT1.5,N,BE,N,-150
+,NIC,EOP,DT1.5,N,BE,C,150
+,NIC,BOP,DT1.5,N,BE,N,300
+,NIC,CF,DT1.5,N,BE,N,-150
 ,PR,EOP,DT1.5,N,BE,C,-400
 ,PR,BOP,DT1.5,N,BE,N,-800
 ,PR,CF,DT1.5,N,BE,N,400
-,NIC,EOP,DT2.1,C,BE,C,299.67555
-,NIC,BOP,DT2.1,C,BE,N,598.75294
-,NIC,CF,DT2.1,C,BE,N,-300
-,NIC,IA,DT2.1,C,BE,N,0.92261
+,DAE,EOP,DT2.1,C,BE,C,149.83777
+,DAE,BOP,DT2.1,C,BE,N,299.37647
+,DAE,CF,DT2.1,C,BE,N,-150
+,DAE,IA,DT2.1,C,BE,N,0.4613
+,NIC,EOP,DT2.1,C,BE,C,149.83777
+,NIC,BOP,DT2.1,C,BE,N,299.37647
+,NIC,CF,DT2.1,C,BE,N,-150
+,NIC,IA,DT2.1,C,BE,N,0.4613
 ,PR,EOP,DT2.1,C,BE,C,-399.63393
 ,PR,BOP,DT2.1,C,BE,N,-798.53673
 ,PR,CF,DT2.1,C,BE,N,400
 ,PR,IA,DT2.1,C,BE,N,-1.0972
-,NIC,EOP,DT2.1,L,BE,C,299.67555
-,NIC,BOP,DT2.1,L,BE,N,598.75294
-,NIC,CF,DT2.1,L,BE,N,-300
-,NIC,IA,DT2.1,L,BE,N,0.92261
+,DAE,EOP,DT2.1,L,BE,C,149.83777
+,DAE,BOP,DT2.1,L,BE,N,299.37647
+,DAE,CF,DT2.1,L,BE,N,-150
+,DAE,IA,DT2.1,L,BE,N,0.4613
+,NIC,EOP,DT2.1,L,BE,C,149.83777
+,NIC,BOP,DT2.1,L,BE,N,299.37647
+,NIC,CF,DT2.1,L,BE,N,-150
+,NIC,IA,DT2.1,L,BE,N,0.4613
 ,PR,EOP,DT2.1,L,BE,C,-399.63393
 ,PR,BOP,DT2.1,L,BE,N,-798.53673
 ,PR,CF,DT2.1,L,BE,N,400
 ,PR,IA,DT2.1,L,BE,N,-1.0972
-,NIC,EOP,DT2.1,N,BE,C,300
-,NIC,BOP,DT2.1,N,BE,N,600
-,NIC,CF,DT2.1,N,BE,N,-300
+,DAE,EOP,DT2.1,N,BE,C,150
+,DAE,BOP,DT2.1,N,BE,N,300
+,DAE,CF,DT2.1,N,BE,N,-150
+,NIC,EOP,DT2.1,N,BE,C,150
+,NIC,BOP,DT2.1,N,BE,N,300
+,NIC,CF,DT2.1,N,BE,N,-150
 ,PR,EOP,DT2.1,N,BE,C,-400
 ,PR,BOP,DT2.1,N,BE,N,-800
 ,PR,CF,DT2.1,N,BE,N,400
@@ -135,47 +190,69 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,EOP,DT2.2,N,BE,C,300
 2020,NIC,BOP,DT2.2,N,BE,N,600
 2020,NIC,CF,DT2.2,N,BE,N,-300
-,NIC,EOP,DT3.1,C,BE,C,299.67555
-,NIC,BOP,DT3.1,C,BE,N,598.75294
-,NIC,CF,DT3.1,C,BE,N,-300
-,NIC,IA,DT3.1,C,BE,N,0.92261
+,DAE,EOP,DT3.1,C,BE,C,149.83777
+,DAE,BOP,DT3.1,C,BE,N,299.37647
+,DAE,CF,DT3.1,C,BE,N,-150
+,DAE,IA,DT3.1,C,BE,N,0.4613
+,NIC,EOP,DT3.1,C,BE,C,149.83777
+,NIC,BOP,DT3.1,C,BE,N,299.37647
+,NIC,CF,DT3.1,C,BE,N,-150
+,NIC,IA,DT3.1,C,BE,N,0.4613
 ,PR,EOP,DT3.1,C,BE,C,-399.63393
 ,PR,BOP,DT3.1,C,BE,N,-798.53673
 ,PR,CF,DT3.1,C,BE,N,400
 ,PR,IA,DT3.1,C,BE,N,-1.0972
-,NIC,EOP,DT3.1,L,BE,C,299.67555
-,NIC,BOP,DT3.1,L,BE,N,598.75294
-,NIC,CF,DT3.1,L,BE,N,-300
-,NIC,IA,DT3.1,L,BE,N,0.92261
+,DAE,EOP,DT3.1,L,BE,C,149.83777
+,DAE,BOP,DT3.1,L,BE,N,299.37647
+,DAE,CF,DT3.1,L,BE,N,-150
+,DAE,IA,DT3.1,L,BE,N,0.4613
+,NIC,EOP,DT3.1,L,BE,C,149.83777
+,NIC,BOP,DT3.1,L,BE,N,299.37647
+,NIC,CF,DT3.1,L,BE,N,-150
+,NIC,IA,DT3.1,L,BE,N,0.4613
 ,PR,EOP,DT3.1,L,BE,C,-399.63393
 ,PR,BOP,DT3.1,L,BE,N,-798.53673
 ,PR,CF,DT3.1,L,BE,N,400
 ,PR,IA,DT3.1,L,BE,N,-1.0972
-,NIC,EOP,DT3.1,N,BE,C,300
-,NIC,BOP,DT3.1,N,BE,N,600
-,NIC,CF,DT3.1,N,BE,N,-300
+,DAE,EOP,DT3.1,N,BE,C,150
+,DAE,BOP,DT3.1,N,BE,N,300
+,DAE,CF,DT3.1,N,BE,N,-150
+,NIC,EOP,DT3.1,N,BE,C,150
+,NIC,BOP,DT3.1,N,BE,N,300
+,NIC,CF,DT3.1,N,BE,N,-150
 ,PR,EOP,DT3.1,N,BE,C,-400
 ,PR,BOP,DT3.1,N,BE,N,-800
 ,PR,CF,DT3.1,N,BE,N,400
-,NIC,EOP,DT4.1,C,BE,C,299.67555
-,NIC,BOP,DT4.1,C,BE,N,598.75294
-,NIC,CF,DT4.1,C,BE,N,-300
-,NIC,IA,DT4.1,C,BE,N,0.92261
+,DAE,EOP,DT4.1,C,BE,C,149.83777
+,DAE,BOP,DT4.1,C,BE,N,299.37647
+,DAE,CF,DT4.1,C,BE,N,-150
+,DAE,IA,DT4.1,C,BE,N,0.4613
+,NIC,EOP,DT4.1,C,BE,C,149.83777
+,NIC,BOP,DT4.1,C,BE,N,299.37647
+,NIC,CF,DT4.1,C,BE,N,-150
+,NIC,IA,DT4.1,C,BE,N,0.4613
 ,PR,EOP,DT4.1,C,BE,C,-399.63393
 ,PR,BOP,DT4.1,C,BE,N,-798.53673
 ,PR,CF,DT4.1,C,BE,N,400
 ,PR,IA,DT4.1,C,BE,N,-1.0972
-,NIC,EOP,DT4.1,L,BE,C,299.67555
-,NIC,BOP,DT4.1,L,BE,N,598.75294
-,NIC,CF,DT4.1,L,BE,N,-300
-,NIC,IA,DT4.1,L,BE,N,0.92261
+,DAE,EOP,DT4.1,L,BE,C,149.83777
+,DAE,BOP,DT4.1,L,BE,N,299.37647
+,DAE,CF,DT4.1,L,BE,N,-150
+,DAE,IA,DT4.1,L,BE,N,0.4613
+,NIC,EOP,DT4.1,L,BE,C,149.83777
+,NIC,BOP,DT4.1,L,BE,N,299.37647
+,NIC,CF,DT4.1,L,BE,N,-150
+,NIC,IA,DT4.1,L,BE,N,0.4613
 ,PR,EOP,DT4.1,L,BE,C,-399.63393
 ,PR,BOP,DT4.1,L,BE,N,-798.53673
 ,PR,CF,DT4.1,L,BE,N,400
 ,PR,IA,DT4.1,L,BE,N,-1.0972
-,NIC,EOP,DT4.1,N,BE,C,300
-,NIC,BOP,DT4.1,N,BE,N,600
-,NIC,CF,DT4.1,N,BE,N,-300
+,DAE,EOP,DT4.1,N,BE,C,150
+,DAE,BOP,DT4.1,N,BE,N,300
+,DAE,CF,DT4.1,N,BE,N,-150
+,NIC,EOP,DT4.1,N,BE,C,150
+,NIC,BOP,DT4.1,N,BE,N,300
+,NIC,CF,DT4.1,N,BE,N,-150
 ,PR,EOP,DT4.1,N,BE,C,-400
 ,PR,BOP,DT4.1,N,BE,N,-800
 ,PR,CF,DT4.1,N,BE,N,400
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BEPA.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BEPA.csv
index 9d38e78a..84a2f43f 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BEPA.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__BEPA.csv
@@ -5,9 +5,9 @@ Month,ReportingNode,Scenario,Year
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
 ,PR,CF,DT1.1,L,BEPA,N,320
 ,PR,CF,DT1.3,L,BEPA,N,400
+,PR,CF,DT1.4,L,BEPA,N,320
+,PR,CF,DT1.5,L,BEPA,N,320
 ,PR,CF,DT2.1,L,BEPA,N,320
 ,PR,CF,DT3.1,L,BEPA,N,320
 ,PR,CF,DT4.1,L,BEPA,N,320
-,PR,CF,DT1.4,L,BEPA,N,320
-,PR,CF,DT1.5,L,BEPA,N,320
 ,PR,CF,DT5.1,L,BEPA,N,320
\ 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 e700dd22..925691be 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,41 +3,41 @@ Month,ReportingNode,Scenario,Year
 12,CH,,2020
 @@C
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,,AM,DT1.1,L,C,C,-82.02271
-,,EA,DT1.1,L,C,C,-15
-,,EOP,DT1.1,L,C,C,42.96811
+,,AM,DT1.1,L,C,C,-98.42846
+,,EA,DT1.1,L,C,C,10
+,,EOP,DT1.1,L,C,C,51.56237
 ,,BOP,DT1.1,L,C,N,139.90849
 ,,IA,DT1.1,L,C,N,0.08233
-,,AM,DT1.3,L,C,C,-82.02271
-,,EA,DT1.3,L,C,C,-15
-,,EOP,DT1.3,L,C,C,42.96811
+,,AM,DT1.3,L,C,C,-98.42846
+,,EA,DT1.3,L,C,C,10
+,,EOP,DT1.3,L,C,C,51.56237
 ,,BOP,DT1.3,L,C,N,139.90849
 ,,IA,DT1.3,L,C,N,0.08233
-,,AM,DT1.4,L,C,C,-82.02271
-,,EA,DT1.4,L,C,C,-15
-,,EOP,DT1.4,L,C,C,42.96811
+,,AM,DT1.4,L,C,C,-98.42846
+,,EA,DT1.4,L,C,C,10
+,,EOP,DT1.4,L,C,C,51.56237
 ,,BOP,DT1.4,L,C,N,139.90849
 ,,IA,DT1.4,L,C,N,0.08233
-,,AM,DT1.5,L,C,C,-82.02271
-,,EA,DT1.5,L,C,C,-15
-,,EOP,DT1.5,L,C,C,42.96811
+,,AM,DT1.5,L,C,C,-98.42846
+,,EA,DT1.5,L,C,C,10
+,,EOP,DT1.5,L,C,C,51.56237
 ,,BOP,DT1.5,L,C,N,139.90849
 ,,IA,DT1.5,L,C,N,0.08233
-,,AM,DT2.1,L,C,C,-82.02271
-,,EA,DT2.1,L,C,C,-15
-,,EOP,DT2.1,L,C,C,42.96811
+,,AM,DT2.1,L,C,C,-98.42846
+,,EA,DT2.1,L,C,C,10
+,,EOP,DT2.1,L,C,C,51.56237
 ,,BOP,DT2.1,L,C,N,139.90849
 ,,IA,DT2.1,L,C,N,0.08233
-,,AM,DT3.1,L,C,C,-129.49727
-,,EA,DT3.1,L,C,C,-15
-,,EOP,DT3.1,L,C,C,67.83796
+,,AM,DT3.1,L,C,C,-145.90301
+,,EA,DT3.1,L,C,C,10
+,,EOP,DT3.1,L,C,C,76.43221
 ,,BOP,DT3.1,L,C,I,72.2
 ,,IA,DT3.1,L,C,I,0.1444
 ,,BOP,DT3.1,L,C,N,139.90849
 ,,IA,DT3.1,L,C,N,0.08233
-,,AM,DT4.1,L,C,C,-82.02271
-,,EA,DT4.1,L,C,C,-15
-,,EOP,DT4.1,L,C,C,42.96811
+,,AM,DT4.1,L,C,C,-98.42846
+,,EA,DT4.1,L,C,C,10
+,,EOP,DT4.1,L,C,C,51.56237
 ,,BOP,DT4.1,L,C,N,139.90849
 ,,IA,DT4.1,L,C,N,0.08233
 ,,AM,DT5.1,,C,C,-82.02271
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__DA.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__DA.csv
index ad659ee2..2cff3ebf 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__DA.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12__DA.csv
@@ -3,27 +3,44 @@ Month,ReportingNode,Scenario,Year
 12,CH,,2020
 @@DA
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,,EOP,DT1.4,,DA,C,-5.15655
-,,AM,DT1.4,,DA,C,9.84345
-,,CF,DT1.1,,DA,C,-15
-,,AM,DT1.1,,DA,C,9.84345
-,,EOP,DT1.1,,DA,C,-5.15655
-,,CF,DT2.1,,DA,C,-15
-,,AM,DT2.1,,DA,C,9.84345
-,,EOP,DT2.1,,DA,C,-5.15655
-,,CF,DT1.3,,DA,C,-15
-,,AM,DT1.3,,DA,C,9.84345
-,,EOP,DT1.3,,DA,C,-5.15655
-,,CF,DT1.4,,DA,C,-15
-,,CF,DT3.1,,DA,C,-15
-,,AM,DT3.1,,DA,C,9.84345
-,,EOP,DT3.1,,DA,C,-5.15655
-,,CF,DT4.1,,DA,C,-15
-,,AM,DT4.1,,DA,C,9.84345
-,,EOP,DT4.1,,DA,C,-5.15655
-,,CF,DT1.5,,DA,C,-15
-,,AM,DT1.5,,DA,C,9.84345
-,,EOP,DT1.5,,DA,C,-5.15655
-,,CF,DT5.1,,DA,C,-15
-,,AM,DT5.1,,DA,C,9.84345
-,,EOP,DT5.1,,DA,C,-5.15655
\ No newline at end of file
+,,AM,DT1.1,L,DA,C,-190.2002
+,,BOP,DT1.1,L,DA,N,299.37647
+,,EA,DT1.1,L,DA,C,-10
+,,EOP,DT1.1,L,DA,C,99.63757
+,,IA,DT1.1,L,DA,N,0.4613
+,,AM,DT1.3,L,DA,C,-190.2002
+,,BOP,DT1.3,L,DA,N,299.37647
+,,EA,DT1.3,L,DA,C,-10
+,,EOP,DT1.3,L,DA,C,99.63757
+,,IA,DT1.3,L,DA,N,0.4613
+,,AM,DT1.4,L,DA,C,-190.2002
+,,BOP,DT1.4,L,DA,N,299.37647
+,,EA,DT1.4,L,DA,C,-10
+,,EOP,DT1.4,L,DA,C,99.63757
+,,IA,DT1.4,L,DA,N,0.4613
+,,AM,DT1.5,L,DA,C,-190.2002
+,,BOP,DT1.5,L,DA,N,299.37647
+,,EA,DT1.5,L,DA,C,-10
+,,EOP,DT1.5,L,DA,C,99.63757
+,,IA,DT1.5,L,DA,N,0.4613
+,,AM,DT2.1,L,DA,C,-190.2002
+,,BOP,DT2.1,L,DA,N,299.37647
+,,EA,DT2.1,L,DA,C,-10
+,,EOP,DT2.1,L,DA,C,99.63757
+,,IA,DT2.1,L,DA,N,0.4613
+,,AM,DT3.1,L,DA,C,-182.96724
+,,BOP,DT3.1,L,DA,I,-11
+,,BOP,DT3.1,L,DA,N,299.37647
+,,EA,DT3.1,L,DA,C,-10
+,,EOP,DT3.1,L,DA,C,95.84854
+,,IA,DT3.1,L,DA,I,-0.022
+,,IA,DT3.1,L,DA,N,0.4613
+,,AM,DT4.1,L,DA,C,-190.2002
+,,BOP,DT4.1,L,DA,N,299.37647
+,,EA,DT4.1,L,DA,C,-10
+,,EOP,DT4.1,L,DA,C,99.63757
+,,IA,DT4.1,L,DA,N,0.4613
+,,AM,DT5.1,,DA,C,9.85821
+,,BOP,DT5.1,,DA,N,-15
+,,EOP,DT5.1,,DA,C,-5.16429
+,,IA,DT5.1,,DA,N,-0.0225
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__A.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__A.csv
index 69780b46..0750370f 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__A.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__A.csv
@@ -3,50 +3,43 @@ Month,ReportingNode,Scenario,Year
 3,CH,,2021
 @@A
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,AEA,CF,DT1.4,,A,C,-5
-,ACA,CF,DT1.4,,A,C,-10
-,ICO,CF,DT1.4,,A,C,-6
-,NIC,CF,DT1.4,,A,C,-70
-,PR,CF,DT1.4,,A,C,90
-,AEA,CF,DT4.1,,A,C,-5
-,ACA,CF,DT4.1,,A,C,-10
-,NIC,CF,DT4.1,,A,C,-70
-,ICO,CF,DT4.1,,A,C,-6
-,PR,CF,DT4.1,,A,C,90
-,AEA,CF,DT3.1,,A,C,-5
-,ACA,CF,DT3.1,,A,C,-10
-,NIC,CF,DT3.1,,A,C,-70
-,ICO,CF,DT3.1,,A,C,-6
-,PR,CF,DT3.1,,A,C,90
-2020,NIC,CF,DTR2.2,,A,C,35
-,NIC,CF,DTR2.1,,A,C,35
-,PR,CF,DTR2.1,,A,C,-45
-2020,NIC,CF,DTR1.2,,A,C,35
-,NIC,CF,DTR1.1,,A,C,35
-,PR,CF,DTR1.1,,A,C,-45
-2020,NIC,CF,DT2.2,,A,C,-76
-,PR,CF,DT1.1,,A,C,90
+,DAE,CF,DT1.1,,A,C,-35
 ,ICO,CF,DT1.1,,A,C,-6
 ,NIC,CF,DT1.1,,A,C,-70
-,ACA,CF,DT1.1,,A,C,-10
-,AEA,CF,DT1.1,,A,C,-5
-,PR,CF,DT1.3,,A,C,90
+,PR,CF,DT1.1,,A,C,90
 2020,NIC,CF,DT1.2,,A,C,-76
+,DAE,CF,DT1.3,,A,C,-35
 ,ICO,CF,DT1.3,,A,C,-6
-,ACA,CF,DT1.3,,A,C,-10
 ,NIC,CF,DT1.3,,A,C,-70
-,AEA,CF,DT1.3,,A,C,-5
-,PR,CF,DT2.1,,A,C,90
-,ICO,CF,DT2.1,,A,C,-6
-,NIC,CF,DT2.1,,A,C,-70
-,ACA,CF,DT2.1,,A,C,-10
-,AEA,CF,DT2.1,,A,C,-5
-,PR,CF,DT1.5,,A,C,90
+,PR,CF,DT1.3,,A,C,90
+,DAE,CF,DT1.4,,A,C,-35
+,ICO,CF,DT1.4,,A,C,-6
+,NIC,CF,DT1.4,,A,C,-70
+,PR,CF,DT1.4,,A,C,90
+,DAE,CF,DT1.5,,A,C,-35
 ,ICO,CF,DT1.5,,A,C,-6
 ,NIC,CF,DT1.5,,A,C,-70
-,ACA,CF,DT1.5,,A,C,-10
-,AEA,CF,DT1.5,,A,C,-5
-,PR,CF,DTR1.3,,A,C,-45
+,PR,CF,DT1.5,,A,C,90
+,DAE,CF,DT2.1,,A,C,-35
+,ICO,CF,DT2.1,,A,C,-6
+,NIC,CF,DT2.1,,A,C,-70
+,PR,CF,DT2.1,,A,C,90
+2020,NIC,CF,DT2.2,,A,C,-76
+,DAE,CF,DT3.1,,A,C,-35
+,ICO,CF,DT3.1,,A,C,-6
+,NIC,CF,DT3.1,,A,C,-70
+,PR,CF,DT3.1,,A,C,90
+,DAE,CF,DT4.1,,A,C,-35
+,ICO,CF,DT4.1,,A,C,-6
+,NIC,CF,DT4.1,,A,C,-70
+,PR,CF,DT4.1,,A,C,90
+,NIC,CF,DTR1.1,,A,C,35
+,PR,CF,DTR1.1,,A,C,-45
+2020,NIC,CF,DTR1.2,,A,C,35
 ,NIC,CF,DTR1.3,,A,C,35
+,PR,CF,DTR1.3,,A,C,-45
+,NIC,CF,DTR1.4,,A,C,35
 ,PR,CF,DTR1.4,,A,C,-45
-,NIC,CF,DTR1.4,,A,C,35
\ No newline at end of file
+,NIC,CF,DTR2.1,,A,C,35
+,PR,CF,DTR2.1,,A,C,-45
+2020,NIC,CF,DTR2.2,,A,C,35
\ 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 282e2e75..2470050e 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
@@ -3,20 +3,30 @@ Month,ReportingNode,Scenario,Year
 3,CH,,2021
 @@BE
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
+,DAE,EOP,DT1.1,C,BE,C,130.22916
+,DAE,BOP,DT1.1,C,BE,I,149.83777
+,DAE,CF,DT1.1,C,BE,I,-30
+,DAE,IA,DT1.1,C,BE,I,0.05489
+,DAE,MC,DT1.1,C,BE,I,-29.96755
+,DAE,YCU,DT1.1,C,BE,I,-0.1119
+,DAE,BOP,DT1.1,C,BE,N,23.93527
+,DAE,CF,DT1.1,C,BE,N,-6
+,DAE,EV,DT1.1,C,BE,N,22.4533
+,DAE,IA,DT1.1,C,BE,N,0.02737
 ,ICO,EOP,DT1.1,C,BE,C,8.98132
 ,ICO,BOP,DT1.1,C,BE,N,11.96764
 ,ICO,CF,DT1.1,C,BE,N,-3
 ,ICO,IA,DT1.1,C,BE,N,0.01368
-,NIC,EOP,DT1.1,C,BE,C,260.45832
-,NIC,BOP,DT1.1,C,BE,I,299.67555
-,NIC,CF,DT1.1,C,BE,I,-60
-,NIC,IA,DT1.1,C,BE,I,0.10979
-,NIC,MC,DT1.1,C,BE,I,-59.93511
-,NIC,YCU,DT1.1,C,BE,I,-0.2238
-,NIC,BOP,DT1.1,C,BE,N,47.87055
-,NIC,CF,DT1.1,C,BE,N,-12
-,NIC,EV,DT1.1,C,BE,N,44.90661
-,NIC,IA,DT1.1,C,BE,N,0.05474
+,NIC,EOP,DT1.1,C,BE,C,130.22916
+,NIC,BOP,DT1.1,C,BE,I,149.83777
+,NIC,CF,DT1.1,C,BE,I,-30
+,NIC,IA,DT1.1,C,BE,I,0.05489
+,NIC,MC,DT1.1,C,BE,I,-29.96755
+,NIC,YCU,DT1.1,C,BE,I,-0.1119
+,NIC,BOP,DT1.1,C,BE,N,23.93527
+,NIC,CF,DT1.1,C,BE,N,-6
+,NIC,EV,DT1.1,C,BE,N,22.4533
+,NIC,IA,DT1.1,C,BE,N,0.02737
 ,PR,EOP,DT1.1,C,BE,C,-344.42709
 ,PR,BOP,DT1.1,C,BE,I,-399.63393
 ,PR,CF,DT1.1,C,BE,I,110
@@ -27,19 +37,28 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.1,C,BE,N,10
 ,PR,EV,DT1.1,C,BE,N,14.97509
 ,PR,IA,DT1.1,C,BE,N,-0.04148
+,DAE,EOP,DT1.1,L,BE,C,130.39142
+,DAE,BOP,DT1.1,L,BE,I,149.83777
+,DAE,CF,DT1.1,L,BE,I,-30
+,DAE,IA,DT1.1,L,BE,I,0.05489
+,DAE,MC,DT1.1,L,BE,I,-29.96755
+,DAE,BOP,DT1.1,L,BE,N,23.97404
+,DAE,CF,DT1.1,L,BE,N,-6
+,DAE,EV,DT1.1,L,BE,N,22.48128
+,DAE,IA,DT1.1,L,BE,N,0.01098
 ,ICO,EOP,DT1.1,L,BE,C,8.99251
 ,ICO,BOP,DT1.1,L,BE,N,11.98702
 ,ICO,CF,DT1.1,L,BE,N,-3
 ,ICO,IA,DT1.1,L,BE,N,0.00549
-,NIC,EOP,DT1.1,L,BE,C,260.78283
-,NIC,BOP,DT1.1,L,BE,I,299.67555
-,NIC,CF,DT1.1,L,BE,I,-60
-,NIC,IA,DT1.1,L,BE,I,0.10979
-,NIC,MC,DT1.1,L,BE,I,-59.93511
-,NIC,BOP,DT1.1,L,BE,N,47.94809
-,NIC,CF,DT1.1,L,BE,N,-12
-,NIC,EV,DT1.1,L,BE,N,44.96256
-,NIC,IA,DT1.1,L,BE,N,0.02196
+,NIC,EOP,DT1.1,L,BE,C,130.39142
+,NIC,BOP,DT1.1,L,BE,I,149.83777
+,NIC,CF,DT1.1,L,BE,I,-30
+,NIC,IA,DT1.1,L,BE,I,0.05489
+,NIC,MC,DT1.1,L,BE,I,-29.96755
+,NIC,BOP,DT1.1,L,BE,N,23.97404
+,NIC,CF,DT1.1,L,BE,N,-6
+,NIC,EV,DT1.1,L,BE,N,22.48128
+,NIC,IA,DT1.1,L,BE,N,0.01098
 ,PR,EOP,DT1.1,L,BE,C,-344.77033
 ,PR,BOP,DT1.1,L,BE,I,-399.63393
 ,PR,CF,DT1.1,L,BE,I,110
@@ -49,16 +68,23 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.1,L,BE,N,10
 ,PR,EV,DT1.1,L,BE,N,14.99001
 ,PR,IA,DT1.1,L,BE,N,-0.01664
+,DAE,EOP,DT1.1,N,BE,C,130.5
+,DAE,BOP,DT1.1,N,BE,I,150
+,DAE,CF,DT1.1,N,BE,I,-30
+,DAE,MC,DT1.1,N,BE,I,-30
+,DAE,BOP,DT1.1,N,BE,N,24
+,DAE,CF,DT1.1,N,BE,N,-6
+,DAE,EV,DT1.1,N,BE,N,22.5
 ,ICO,EOP,DT1.1,N,BE,C,9
 ,ICO,BOP,DT1.1,N,BE,N,12
 ,ICO,CF,DT1.1,N,BE,N,-3
-,NIC,EOP,DT1.1,N,BE,C,261
-,NIC,BOP,DT1.1,N,BE,I,300
-,NIC,CF,DT1.1,N,BE,I,-60
-,NIC,MC,DT1.1,N,BE,I,-60
-,NIC,BOP,DT1.1,N,BE,N,48
-,NIC,CF,DT1.1,N,BE,N,-12
-,NIC,EV,DT1.1,N,BE,N,45
+,NIC,EOP,DT1.1,N,BE,C,130.5
+,NIC,BOP,DT1.1,N,BE,I,150
+,NIC,CF,DT1.1,N,BE,I,-30
+,NIC,MC,DT1.1,N,BE,I,-30
+,NIC,BOP,DT1.1,N,BE,N,24
+,NIC,CF,DT1.1,N,BE,N,-6
+,NIC,EV,DT1.1,N,BE,N,22.5
 ,PR,EOP,DT1.1,N,BE,C,-345
 ,PR,BOP,DT1.1,N,BE,I,-400
 ,PR,CF,DT1.1,N,BE,I,110
@@ -92,20 +118,30 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,BOP,DT1.2,N,BE,N,60
 2020,NIC,CF,DT1.2,N,BE,N,-15
 2020,NIC,EV,DT1.2,N,BE,N,45
+,DAE,EOP,DT1.3,C,BE,C,130.22916
+,DAE,BOP,DT1.3,C,BE,I,149.83777
+,DAE,CF,DT1.3,C,BE,I,-30
+,DAE,IA,DT1.3,C,BE,I,0.05489
+,DAE,MC,DT1.3,C,BE,I,-29.96755
+,DAE,YCU,DT1.3,C,BE,I,-0.1119
+,DAE,BOP,DT1.3,C,BE,N,23.93527
+,DAE,CF,DT1.3,C,BE,N,-6
+,DAE,EV,DT1.3,C,BE,N,22.4533
+,DAE,IA,DT1.3,C,BE,N,0.02737
 ,ICO,EOP,DT1.3,C,BE,C,8.98132
 ,ICO,BOP,DT1.3,C,BE,N,11.96764
 ,ICO,CF,DT1.3,C,BE,N,-3
 ,ICO,IA,DT1.3,C,BE,N,0.01368
-,NIC,EOP,DT1.3,C,BE,C,260.45832
-,NIC,BOP,DT1.3,C,BE,I,299.67555
-,NIC,CF,DT1.3,C,BE,I,-60
-,NIC,IA,DT1.3,C,BE,I,0.10979
-,NIC,MC,DT1.3,C,BE,I,-59.93511
-,NIC,YCU,DT1.3,C,BE,I,-0.2238
-,NIC,BOP,DT1.3,C,BE,N,47.87055
-,NIC,CF,DT1.3,C,BE,N,-12
-,NIC,EV,DT1.3,C,BE,N,44.90661
-,NIC,IA,DT1.3,C,BE,N,0.05474
+,NIC,EOP,DT1.3,C,BE,C,130.22916
+,NIC,BOP,DT1.3,C,BE,I,149.83777
+,NIC,CF,DT1.3,C,BE,I,-30
+,NIC,IA,DT1.3,C,BE,I,0.05489
+,NIC,MC,DT1.3,C,BE,I,-29.96755
+,NIC,YCU,DT1.3,C,BE,I,-0.1119
+,NIC,BOP,DT1.3,C,BE,N,23.93527
+,NIC,CF,DT1.3,C,BE,N,-6
+,NIC,EV,DT1.3,C,BE,N,22.4533
+,NIC,IA,DT1.3,C,BE,N,0.02737
 ,PR,EOP,DT1.3,C,BE,C,-344.42709
 ,PR,BOP,DT1.3,C,BE,I,-399.63393
 ,PR,CF,DT1.3,C,BE,I,110
@@ -116,19 +152,28 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.3,C,BE,N,10
 ,PR,EV,DT1.3,C,BE,N,14.97509
 ,PR,IA,DT1.3,C,BE,N,-0.04148
+,DAE,EOP,DT1.3,L,BE,C,130.39142
+,DAE,BOP,DT1.3,L,BE,I,149.83777
+,DAE,CF,DT1.3,L,BE,I,-30
+,DAE,IA,DT1.3,L,BE,I,0.05489
+,DAE,MC,DT1.3,L,BE,I,-29.96755
+,DAE,BOP,DT1.3,L,BE,N,23.97404
+,DAE,CF,DT1.3,L,BE,N,-6
+,DAE,EV,DT1.3,L,BE,N,22.48128
+,DAE,IA,DT1.3,L,BE,N,0.01098
 ,ICO,EOP,DT1.3,L,BE,C,8.99251
 ,ICO,BOP,DT1.3,L,BE,N,11.98702
 ,ICO,CF,DT1.3,L,BE,N,-3
 ,ICO,IA,DT1.3,L,BE,N,0.00549
-,NIC,EOP,DT1.3,L,BE,C,260.78283
-,NIC,BOP,DT1.3,L,BE,I,299.67555
-,NIC,CF,DT1.3,L,BE,I,-60
-,NIC,IA,DT1.3,L,BE,I,0.10979
-,NIC,MC,DT1.3,L,BE,I,-59.93511
-,NIC,BOP,DT1.3,L,BE,N,47.94809
-,NIC,CF,DT1.3,L,BE,N,-12
-,NIC,EV,DT1.3,L,BE,N,44.96256
-,NIC,IA,DT1.3,L,BE,N,0.02196
+,NIC,EOP,DT1.3,L,BE,C,130.39142
+,NIC,BOP,DT1.3,L,BE,I,149.83777
+,NIC,CF,DT1.3,L,BE,I,-30
+,NIC,IA,DT1.3,L,BE,I,0.05489
+,NIC,MC,DT1.3,L,BE,I,-29.96755
+,NIC,BOP,DT1.3,L,BE,N,23.97404
+,NIC,CF,DT1.3,L,BE,N,-6
+,NIC,EV,DT1.3,L,BE,N,22.48128
+,NIC,IA,DT1.3,L,BE,N,0.01098
 ,PR,EOP,DT1.3,L,BE,C,-344.77033
 ,PR,BOP,DT1.3,L,BE,I,-399.63393
 ,PR,CF,DT1.3,L,BE,I,110
@@ -138,16 +183,23 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.3,L,BE,N,10
 ,PR,EV,DT1.3,L,BE,N,14.99001
 ,PR,IA,DT1.3,L,BE,N,-0.01664
+,DAE,EOP,DT1.3,N,BE,C,130.5
+,DAE,BOP,DT1.3,N,BE,I,150
+,DAE,CF,DT1.3,N,BE,I,-30
+,DAE,MC,DT1.3,N,BE,I,-30
+,DAE,BOP,DT1.3,N,BE,N,24
+,DAE,CF,DT1.3,N,BE,N,-6
+,DAE,EV,DT1.3,N,BE,N,22.5
 ,ICO,EOP,DT1.3,N,BE,C,9
 ,ICO,BOP,DT1.3,N,BE,N,12
 ,ICO,CF,DT1.3,N,BE,N,-3
-,NIC,EOP,DT1.3,N,BE,C,261
-,NIC,BOP,DT1.3,N,BE,I,300
-,NIC,CF,DT1.3,N,BE,I,-60
-,NIC,MC,DT1.3,N,BE,I,-60
-,NIC,BOP,DT1.3,N,BE,N,48
-,NIC,CF,DT1.3,N,BE,N,-12
-,NIC,EV,DT1.3,N,BE,N,45
+,NIC,EOP,DT1.3,N,BE,C,130.5
+,NIC,BOP,DT1.3,N,BE,I,150
+,NIC,CF,DT1.3,N,BE,I,-30
+,NIC,MC,DT1.3,N,BE,I,-30
+,NIC,BOP,DT1.3,N,BE,N,24
+,NIC,CF,DT1.3,N,BE,N,-6
+,NIC,EV,DT1.3,N,BE,N,22.5
 ,PR,EOP,DT1.3,N,BE,C,-345
 ,PR,BOP,DT1.3,N,BE,I,-400
 ,PR,CF,DT1.3,N,BE,I,110
@@ -155,20 +207,30 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DT1.3,N,BE,N,-40
 ,PR,CF,DT1.3,N,BE,N,10
 ,PR,EV,DT1.3,N,BE,N,15
+,DAE,EOP,DT1.4,C,BE,C,130.22916
+,DAE,BOP,DT1.4,C,BE,I,149.83777
+,DAE,CF,DT1.4,C,BE,I,-30
+,DAE,IA,DT1.4,C,BE,I,0.05489
+,DAE,MC,DT1.4,C,BE,I,-29.96755
+,DAE,YCU,DT1.4,C,BE,I,-0.1119
+,DAE,BOP,DT1.4,C,BE,N,23.93527
+,DAE,CF,DT1.4,C,BE,N,-6
+,DAE,EV,DT1.4,C,BE,N,22.4533
+,DAE,IA,DT1.4,C,BE,N,0.02737
 ,ICO,EOP,DT1.4,C,BE,C,8.98132
 ,ICO,BOP,DT1.4,C,BE,N,11.96764
 ,ICO,CF,DT1.4,C,BE,N,-3
 ,ICO,IA,DT1.4,C,BE,N,0.01368
-,NIC,EOP,DT1.4,C,BE,C,260.45832
-,NIC,BOP,DT1.4,C,BE,I,299.67555
-,NIC,CF,DT1.4,C,BE,I,-60
-,NIC,IA,DT1.4,C,BE,I,0.10979
-,NIC,MC,DT1.4,C,BE,I,-59.93511
-,NIC,YCU,DT1.4,C,BE,I,-0.2238
-,NIC,BOP,DT1.4,C,BE,N,47.87055
-,NIC,CF,DT1.4,C,BE,N,-12
-,NIC,EV,DT1.4,C,BE,N,44.90661
-,NIC,IA,DT1.4,C,BE,N,0.05474
+,NIC,EOP,DT1.4,C,BE,C,130.22916
+,NIC,BOP,DT1.4,C,BE,I,149.83777
+,NIC,CF,DT1.4,C,BE,I,-30
+,NIC,IA,DT1.4,C,BE,I,0.05489
+,NIC,MC,DT1.4,C,BE,I,-29.96755
+,NIC,YCU,DT1.4,C,BE,I,-0.1119
+,NIC,BOP,DT1.4,C,BE,N,23.93527
+,NIC,CF,DT1.4,C,BE,N,-6
+,NIC,EV,DT1.4,C,BE,N,22.4533
+,NIC,IA,DT1.4,C,BE,N,0.02737
 ,PR,EOP,DT1.4,C,BE,C,-344.42709
 ,PR,BOP,DT1.4,C,BE,I,-399.63393
 ,PR,CF,DT1.4,C,BE,I,110
@@ -179,19 +241,28 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.4,C,BE,N,10
 ,PR,EV,DT1.4,C,BE,N,14.97509
 ,PR,IA,DT1.4,C,BE,N,-0.04148
+,DAE,EOP,DT1.4,L,BE,C,130.39142
+,DAE,BOP,DT1.4,L,BE,I,149.83777
+,DAE,CF,DT1.4,L,BE,I,-30
+,DAE,IA,DT1.4,L,BE,I,0.05489
+,DAE,MC,DT1.4,L,BE,I,-29.96755
+,DAE,BOP,DT1.4,L,BE,N,23.97404
+,DAE,CF,DT1.4,L,BE,N,-6
+,DAE,EV,DT1.4,L,BE,N,22.48128
+,DAE,IA,DT1.4,L,BE,N,0.01098
 ,ICO,EOP,DT1.4,L,BE,C,8.99251
 ,ICO,BOP,DT1.4,L,BE,N,11.98702
 ,ICO,CF,DT1.4,L,BE,N,-3
 ,ICO,IA,DT1.4,L,BE,N,0.00549
-,NIC,EOP,DT1.4,L,BE,C,260.78283
-,NIC,BOP,DT1.4,L,BE,I,299.67555
-,NIC,CF,DT1.4,L,BE,I,-60
-,NIC,IA,DT1.4,L,BE,I,0.10979
-,NIC,MC,DT1.4,L,BE,I,-59.93511
-,NIC,BOP,DT1.4,L,BE,N,47.94809
-,NIC,CF,DT1.4,L,BE,N,-12
-,NIC,EV,DT1.4,L,BE,N,44.96256
-,NIC,IA,DT1.4,L,BE,N,0.02196
+,NIC,EOP,DT1.4,L,BE,C,130.39142
+,NIC,BOP,DT1.4,L,BE,I,149.83777
+,NIC,CF,DT1.4,L,BE,I,-30
+,NIC,IA,DT1.4,L,BE,I,0.05489
+,NIC,MC,DT1.4,L,BE,I,-29.96755
+,NIC,BOP,DT1.4,L,BE,N,23.97404
+,NIC,CF,DT1.4,L,BE,N,-6
+,NIC,EV,DT1.4,L,BE,N,22.48128
+,NIC,IA,DT1.4,L,BE,N,0.01098
 ,PR,EOP,DT1.4,L,BE,C,-344.77033
 ,PR,BOP,DT1.4,L,BE,I,-399.63393
 ,PR,CF,DT1.4,L,BE,I,110
@@ -201,16 +272,23 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.4,L,BE,N,10
 ,PR,EV,DT1.4,L,BE,N,14.99001
 ,PR,IA,DT1.4,L,BE,N,-0.01664
+,DAE,EOP,DT1.4,N,BE,C,130.5
+,DAE,BOP,DT1.4,N,BE,I,150
+,DAE,CF,DT1.4,N,BE,I,-30
+,DAE,MC,DT1.4,N,BE,I,-30
+,DAE,BOP,DT1.4,N,BE,N,24
+,DAE,CF,DT1.4,N,BE,N,-6
+,DAE,EV,DT1.4,N,BE,N,22.5
 ,ICO,EOP,DT1.4,N,BE,C,9
 ,ICO,BOP,DT1.4,N,BE,N,12
 ,ICO,CF,DT1.4,N,BE,N,-3
-,NIC,EOP,DT1.4,N,BE,C,261
-,NIC,BOP,DT1.4,N,BE,I,300
-,NIC,CF,DT1.4,N,BE,I,-60
-,NIC,MC,DT1.4,N,BE,I,-60
-,NIC,BOP,DT1.4,N,BE,N,48
-,NIC,CF,DT1.4,N,BE,N,-12
-,NIC,EV,DT1.4,N,BE,N,45
+,NIC,EOP,DT1.4,N,BE,C,130.5
+,NIC,BOP,DT1.4,N,BE,I,150
+,NIC,CF,DT1.4,N,BE,I,-30
+,NIC,MC,DT1.4,N,BE,I,-30
+,NIC,BOP,DT1.4,N,BE,N,24
+,NIC,CF,DT1.4,N,BE,N,-6
+,NIC,EV,DT1.4,N,BE,N,22.5
 ,PR,EOP,DT1.4,N,BE,C,-345
 ,PR,BOP,DT1.4,N,BE,I,-400
 ,PR,CF,DT1.4,N,BE,I,110
@@ -218,20 +296,30 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DT1.4,N,BE,N,-40
 ,PR,CF,DT1.4,N,BE,N,10
 ,PR,EV,DT1.4,N,BE,N,15
+,DAE,EOP,DT1.5,C,BE,C,130.22916
+,DAE,BOP,DT1.5,C,BE,I,149.83777
+,DAE,CF,DT1.5,C,BE,I,-30
+,DAE,IA,DT1.5,C,BE,I,0.05489
+,DAE,MC,DT1.5,C,BE,I,-29.96755
+,DAE,YCU,DT1.5,C,BE,I,-0.1119
+,DAE,BOP,DT1.5,C,BE,N,23.93527
+,DAE,CF,DT1.5,C,BE,N,-6
+,DAE,EV,DT1.5,C,BE,N,22.4533
+,DAE,IA,DT1.5,C,BE,N,0.02737
 ,ICO,EOP,DT1.5,C,BE,C,8.98132
 ,ICO,BOP,DT1.5,C,BE,N,11.96764
 ,ICO,CF,DT1.5,C,BE,N,-3
 ,ICO,IA,DT1.5,C,BE,N,0.01368
-,NIC,EOP,DT1.5,C,BE,C,260.45832
-,NIC,BOP,DT1.5,C,BE,I,299.67555
-,NIC,CF,DT1.5,C,BE,I,-60
-,NIC,IA,DT1.5,C,BE,I,0.10979
-,NIC,MC,DT1.5,C,BE,I,-59.93511
-,NIC,YCU,DT1.5,C,BE,I,-0.2238
-,NIC,BOP,DT1.5,C,BE,N,47.87055
-,NIC,CF,DT1.5,C,BE,N,-12
-,NIC,EV,DT1.5,C,BE,N,44.90661
-,NIC,IA,DT1.5,C,BE,N,0.05474
+,NIC,EOP,DT1.5,C,BE,C,130.22916
+,NIC,BOP,DT1.5,C,BE,I,149.83777
+,NIC,CF,DT1.5,C,BE,I,-30
+,NIC,IA,DT1.5,C,BE,I,0.05489
+,NIC,MC,DT1.5,C,BE,I,-29.96755
+,NIC,YCU,DT1.5,C,BE,I,-0.1119
+,NIC,BOP,DT1.5,C,BE,N,23.93527
+,NIC,CF,DT1.5,C,BE,N,-6
+,NIC,EV,DT1.5,C,BE,N,22.4533
+,NIC,IA,DT1.5,C,BE,N,0.02737
 ,PR,EOP,DT1.5,C,BE,C,-344.42709
 ,PR,BOP,DT1.5,C,BE,I,-399.63393
 ,PR,CF,DT1.5,C,BE,I,110
@@ -242,19 +330,28 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.5,C,BE,N,10
 ,PR,EV,DT1.5,C,BE,N,14.97509
 ,PR,IA,DT1.5,C,BE,N,-0.04148
+,DAE,EOP,DT1.5,L,BE,C,130.39142
+,DAE,BOP,DT1.5,L,BE,I,149.83777
+,DAE,CF,DT1.5,L,BE,I,-30
+,DAE,IA,DT1.5,L,BE,I,0.05489
+,DAE,MC,DT1.5,L,BE,I,-29.96755
+,DAE,BOP,DT1.5,L,BE,N,23.97404
+,DAE,CF,DT1.5,L,BE,N,-6
+,DAE,EV,DT1.5,L,BE,N,22.48128
+,DAE,IA,DT1.5,L,BE,N,0.01098
 ,ICO,EOP,DT1.5,L,BE,C,8.99251
 ,ICO,BOP,DT1.5,L,BE,N,11.98702
 ,ICO,CF,DT1.5,L,BE,N,-3
 ,ICO,IA,DT1.5,L,BE,N,0.00549
-,NIC,EOP,DT1.5,L,BE,C,260.78283
-,NIC,BOP,DT1.5,L,BE,I,299.67555
-,NIC,CF,DT1.5,L,BE,I,-60
-,NIC,IA,DT1.5,L,BE,I,0.10979
-,NIC,MC,DT1.5,L,BE,I,-59.93511
-,NIC,BOP,DT1.5,L,BE,N,47.94809
-,NIC,CF,DT1.5,L,BE,N,-12
-,NIC,EV,DT1.5,L,BE,N,44.96256
-,NIC,IA,DT1.5,L,BE,N,0.02196
+,NIC,EOP,DT1.5,L,BE,C,130.39142
+,NIC,BOP,DT1.5,L,BE,I,149.83777
+,NIC,CF,DT1.5,L,BE,I,-30
+,NIC,IA,DT1.5,L,BE,I,0.05489
+,NIC,MC,DT1.5,L,BE,I,-29.96755
+,NIC,BOP,DT1.5,L,BE,N,23.97404
+,NIC,CF,DT1.5,L,BE,N,-6
+,NIC,EV,DT1.5,L,BE,N,22.48128
+,NIC,IA,DT1.5,L,BE,N,0.01098
 ,PR,EOP,DT1.5,L,BE,C,-344.77033
 ,PR,BOP,DT1.5,L,BE,I,-399.63393
 ,PR,CF,DT1.5,L,BE,I,110
@@ -264,16 +361,23 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.5,L,BE,N,10
 ,PR,EV,DT1.5,L,BE,N,14.99001
 ,PR,IA,DT1.5,L,BE,N,-0.01664
+,DAE,EOP,DT1.5,N,BE,C,130.5
+,DAE,BOP,DT1.5,N,BE,I,150
+,DAE,CF,DT1.5,N,BE,I,-30
+,DAE,MC,DT1.5,N,BE,I,-30
+,DAE,BOP,DT1.5,N,BE,N,24
+,DAE,CF,DT1.5,N,BE,N,-6
+,DAE,EV,DT1.5,N,BE,N,22.5
 ,ICO,EOP,DT1.5,N,BE,C,9
 ,ICO,BOP,DT1.5,N,BE,N,12
 ,ICO,CF,DT1.5,N,BE,N,-3
-,NIC,EOP,DT1.5,N,BE,C,261
-,NIC,BOP,DT1.5,N,BE,I,300
-,NIC,CF,DT1.5,N,BE,I,-60
-,NIC,MC,DT1.5,N,BE,I,-60
-,NIC,BOP,DT1.5,N,BE,N,48
-,NIC,CF,DT1.5,N,BE,N,-12
-,NIC,EV,DT1.5,N,BE,N,45
+,NIC,EOP,DT1.5,N,BE,C,130.5
+,NIC,BOP,DT1.5,N,BE,I,150
+,NIC,CF,DT1.5,N,BE,I,-30
+,NIC,MC,DT1.5,N,BE,I,-30
+,NIC,BOP,DT1.5,N,BE,N,24
+,NIC,CF,DT1.5,N,BE,N,-6
+,NIC,EV,DT1.5,N,BE,N,22.5
 ,PR,EOP,DT1.5,N,BE,C,-345
 ,PR,BOP,DT1.5,N,BE,I,-400
 ,PR,CF,DT1.5,N,BE,I,110
@@ -281,20 +385,30 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DT1.5,N,BE,N,-40
 ,PR,CF,DT1.5,N,BE,N,10
 ,PR,EV,DT1.5,N,BE,N,15
+,DAE,EOP,DT2.1,C,BE,C,130.22916
+,DAE,BOP,DT2.1,C,BE,I,149.83777
+,DAE,CF,DT2.1,C,BE,I,-30
+,DAE,IA,DT2.1,C,BE,I,0.05489
+,DAE,MC,DT2.1,C,BE,I,-29.96755
+,DAE,YCU,DT2.1,C,BE,I,-0.1119
+,DAE,BOP,DT2.1,C,BE,N,23.93527
+,DAE,CF,DT2.1,C,BE,N,-6
+,DAE,EV,DT2.1,C,BE,N,22.4533
+,DAE,IA,DT2.1,C,BE,N,0.02737
 ,ICO,EOP,DT2.1,C,BE,C,8.98132
 ,ICO,BOP,DT2.1,C,BE,N,11.96764
 ,ICO,CF,DT2.1,C,BE,N,-3
 ,ICO,IA,DT2.1,C,BE,N,0.01368
-,NIC,EOP,DT2.1,C,BE,C,260.45832
-,NIC,BOP,DT2.1,C,BE,I,299.67555
-,NIC,CF,DT2.1,C,BE,I,-60
-,NIC,IA,DT2.1,C,BE,I,0.10979
-,NIC,MC,DT2.1,C,BE,I,-59.93511
-,NIC,YCU,DT2.1,C,BE,I,-0.2238
-,NIC,BOP,DT2.1,C,BE,N,47.87055
-,NIC,CF,DT2.1,C,BE,N,-12
-,NIC,EV,DT2.1,C,BE,N,44.90661
-,NIC,IA,DT2.1,C,BE,N,0.05474
+,NIC,EOP,DT2.1,C,BE,C,130.22916
+,NIC,BOP,DT2.1,C,BE,I,149.83777
+,NIC,CF,DT2.1,C,BE,I,-30
+,NIC,IA,DT2.1,C,BE,I,0.05489
+,NIC,MC,DT2.1,C,BE,I,-29.96755
+,NIC,YCU,DT2.1,C,BE,I,-0.1119
+,NIC,BOP,DT2.1,C,BE,N,23.93527
+,NIC,CF,DT2.1,C,BE,N,-6
+,NIC,EV,DT2.1,C,BE,N,22.4533
+,NIC,IA,DT2.1,C,BE,N,0.02737
 ,PR,EOP,DT2.1,C,BE,C,-344.42709
 ,PR,BOP,DT2.1,C,BE,I,-399.63393
 ,PR,CF,DT2.1,C,BE,I,110
@@ -305,19 +419,28 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT2.1,C,BE,N,10
 ,PR,EV,DT2.1,C,BE,N,14.97509
 ,PR,IA,DT2.1,C,BE,N,-0.04148
+,DAE,EOP,DT2.1,L,BE,C,130.39142
+,DAE,BOP,DT2.1,L,BE,I,149.83777
+,DAE,CF,DT2.1,L,BE,I,-30
+,DAE,IA,DT2.1,L,BE,I,0.05489
+,DAE,MC,DT2.1,L,BE,I,-29.96755
+,DAE,BOP,DT2.1,L,BE,N,23.97404
+,DAE,CF,DT2.1,L,BE,N,-6
+,DAE,EV,DT2.1,L,BE,N,22.48128
+,DAE,IA,DT2.1,L,BE,N,0.01098
 ,ICO,EOP,DT2.1,L,BE,C,8.99251
 ,ICO,BOP,DT2.1,L,BE,N,11.98702
 ,ICO,CF,DT2.1,L,BE,N,-3
 ,ICO,IA,DT2.1,L,BE,N,0.00549
-,NIC,EOP,DT2.1,L,BE,C,260.78283
-,NIC,BOP,DT2.1,L,BE,I,299.67555
-,NIC,CF,DT2.1,L,BE,I,-60
-,NIC,IA,DT2.1,L,BE,I,0.10979
-,NIC,MC,DT2.1,L,BE,I,-59.93511
-,NIC,BOP,DT2.1,L,BE,N,47.94809
-,NIC,CF,DT2.1,L,BE,N,-12
-,NIC,EV,DT2.1,L,BE,N,44.96256
-,NIC,IA,DT2.1,L,BE,N,0.02196
+,NIC,EOP,DT2.1,L,BE,C,130.39142
+,NIC,BOP,DT2.1,L,BE,I,149.83777
+,NIC,CF,DT2.1,L,BE,I,-30
+,NIC,IA,DT2.1,L,BE,I,0.05489
+,NIC,MC,DT2.1,L,BE,I,-29.96755
+,NIC,BOP,DT2.1,L,BE,N,23.97404
+,NIC,CF,DT2.1,L,BE,N,-6
+,NIC,EV,DT2.1,L,BE,N,22.48128
+,NIC,IA,DT2.1,L,BE,N,0.01098
 ,PR,EOP,DT2.1,L,BE,C,-344.77033
 ,PR,BOP,DT2.1,L,BE,I,-399.63393
 ,PR,CF,DT2.1,L,BE,I,110
@@ -327,16 +450,23 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT2.1,L,BE,N,10
 ,PR,EV,DT2.1,L,BE,N,14.99001
 ,PR,IA,DT2.1,L,BE,N,-0.01664
+,DAE,EOP,DT2.1,N,BE,C,130.5
+,DAE,BOP,DT2.1,N,BE,I,150
+,DAE,CF,DT2.1,N,BE,I,-30
+,DAE,MC,DT2.1,N,BE,I,-30
+,DAE,BOP,DT2.1,N,BE,N,24
+,DAE,CF,DT2.1,N,BE,N,-6
+,DAE,EV,DT2.1,N,BE,N,22.5
 ,ICO,EOP,DT2.1,N,BE,C,9
 ,ICO,BOP,DT2.1,N,BE,N,12
 ,ICO,CF,DT2.1,N,BE,N,-3
-,NIC,EOP,DT2.1,N,BE,C,261
-,NIC,BOP,DT2.1,N,BE,I,300
-,NIC,CF,DT2.1,N,BE,I,-60
-,NIC,MC,DT2.1,N,BE,I,-60
-,NIC,BOP,DT2.1,N,BE,N,48
-,NIC,CF,DT2.1,N,BE,N,-12
-,NIC,EV,DT2.1,N,BE,N,45
+,NIC,EOP,DT2.1,N,BE,C,130.5
+,NIC,BOP,DT2.1,N,BE,I,150
+,NIC,CF,DT2.1,N,BE,I,-30
+,NIC,MC,DT2.1,N,BE,I,-30
+,NIC,BOP,DT2.1,N,BE,N,24
+,NIC,CF,DT2.1,N,BE,N,-6
+,NIC,EV,DT2.1,N,BE,N,22.5
 ,PR,EOP,DT2.1,N,BE,C,-345
 ,PR,BOP,DT2.1,N,BE,I,-400
 ,PR,CF,DT2.1,N,BE,I,110
@@ -370,20 +500,30 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 2020,NIC,BOP,DT2.2,N,BE,N,60
 2020,NIC,CF,DT2.2,N,BE,N,-15
 2020,NIC,EV,DT2.2,N,BE,N,45
+,DAE,CL,DT3.1,C,BE,C,-130.22916
+,DAE,BOP,DT3.1,C,BE,I,149.83777
+,DAE,CF,DT3.1,C,BE,I,-30
+,DAE,IA,DT3.1,C,BE,I,0.05489
+,DAE,MC,DT3.1,C,BE,I,-29.96755
+,DAE,YCU,DT3.1,C,BE,I,-0.1119
+,DAE,BOP,DT3.1,C,BE,N,23.93527
+,DAE,CF,DT3.1,C,BE,N,-6
+,DAE,EV,DT3.1,C,BE,N,22.4533
+,DAE,IA,DT3.1,C,BE,N,0.02737
 ,ICO,CL,DT3.1,C,BE,C,-8.98132
 ,ICO,BOP,DT3.1,C,BE,N,11.96764
 ,ICO,CF,DT3.1,C,BE,N,-3
 ,ICO,IA,DT3.1,C,BE,N,0.01368
-,NIC,CL,DT3.1,C,BE,C,-260.45832
-,NIC,BOP,DT3.1,C,BE,I,299.67555
-,NIC,CF,DT3.1,C,BE,I,-60
-,NIC,IA,DT3.1,C,BE,I,0.10979
-,NIC,MC,DT3.1,C,BE,I,-59.93511
-,NIC,YCU,DT3.1,C,BE,I,-0.2238
-,NIC,BOP,DT3.1,C,BE,N,47.87055
-,NIC,CF,DT3.1,C,BE,N,-12
-,NIC,EV,DT3.1,C,BE,N,44.90661
-,NIC,IA,DT3.1,C,BE,N,0.05474
+,NIC,CL,DT3.1,C,BE,C,-130.22916
+,NIC,BOP,DT3.1,C,BE,I,149.83777
+,NIC,CF,DT3.1,C,BE,I,-30
+,NIC,IA,DT3.1,C,BE,I,0.05489
+,NIC,MC,DT3.1,C,BE,I,-29.96755
+,NIC,YCU,DT3.1,C,BE,I,-0.1119
+,NIC,BOP,DT3.1,C,BE,N,23.93527
+,NIC,CF,DT3.1,C,BE,N,-6
+,NIC,EV,DT3.1,C,BE,N,22.4533
+,NIC,IA,DT3.1,C,BE,N,0.02737
 ,PR,CL,DT3.1,C,BE,C,344.42709
 ,PR,BOP,DT3.1,C,BE,I,-399.63393
 ,PR,CF,DT3.1,C,BE,I,110
@@ -394,19 +534,28 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT3.1,C,BE,N,10
 ,PR,EV,DT3.1,C,BE,N,14.97509
 ,PR,IA,DT3.1,C,BE,N,-0.04148
+,DAE,CL,DT3.1,L,BE,C,-130.39142
+,DAE,BOP,DT3.1,L,BE,I,149.83777
+,DAE,CF,DT3.1,L,BE,I,-30
+,DAE,IA,DT3.1,L,BE,I,0.05489
+,DAE,MC,DT3.1,L,BE,I,-29.96755
+,DAE,BOP,DT3.1,L,BE,N,23.97404
+,DAE,CF,DT3.1,L,BE,N,-6
+,DAE,EV,DT3.1,L,BE,N,22.48128
+,DAE,IA,DT3.1,L,BE,N,0.01098
 ,ICO,CL,DT3.1,L,BE,C,-8.99251
 ,ICO,BOP,DT3.1,L,BE,N,11.98702
 ,ICO,CF,DT3.1,L,BE,N,-3
 ,ICO,IA,DT3.1,L,BE,N,0.00549
-,NIC,CL,DT3.1,L,BE,C,-260.78283
-,NIC,BOP,DT3.1,L,BE,I,299.67555
-,NIC,CF,DT3.1,L,BE,I,-60
-,NIC,IA,DT3.1,L,BE,I,0.10979
-,NIC,MC,DT3.1,L,BE,I,-59.93511
-,NIC,BOP,DT3.1,L,BE,N,47.94809
-,NIC,CF,DT3.1,L,BE,N,-12
-,NIC,EV,DT3.1,L,BE,N,44.96256
-,NIC,IA,DT3.1,L,BE,N,0.02196
+,NIC,CL,DT3.1,L,BE,C,-130.39142
+,NIC,BOP,DT3.1,L,BE,I,149.83777
+,NIC,CF,DT3.1,L,BE,I,-30
+,NIC,IA,DT3.1,L,BE,I,0.05489
+,NIC,MC,DT3.1,L,BE,I,-29.96755
+,NIC,BOP,DT3.1,L,BE,N,23.97404
+,NIC,CF,DT3.1,L,BE,N,-6
+,NIC,EV,DT3.1,L,BE,N,22.48128
+,NIC,IA,DT3.1,L,BE,N,0.01098
 ,PR,CL,DT3.1,L,BE,C,344.77033
 ,PR,BOP,DT3.1,L,BE,I,-399.63393
 ,PR,CF,DT3.1,L,BE,I,110
@@ -416,16 +565,23 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT3.1,L,BE,N,10
 ,PR,EV,DT3.1,L,BE,N,14.99001
 ,PR,IA,DT3.1,L,BE,N,-0.01664
+,DAE,CL,DT3.1,N,BE,C,-130.5
+,DAE,BOP,DT3.1,N,BE,I,150
+,DAE,CF,DT3.1,N,BE,I,-30
+,DAE,MC,DT3.1,N,BE,I,-30
+,DAE,BOP,DT3.1,N,BE,N,24
+,DAE,CF,DT3.1,N,BE,N,-6
+,DAE,EV,DT3.1,N,BE,N,22.5
 ,ICO,CL,DT3.1,N,BE,C,-9
 ,ICO,BOP,DT3.1,N,BE,N,12
 ,ICO,CF,DT3.1,N,BE,N,-3
-,NIC,CL,DT3.1,N,BE,C,-261
-,NIC,BOP,DT3.1,N,BE,I,300
-,NIC,CF,DT3.1,N,BE,I,-60
-,NIC,MC,DT3.1,N,BE,I,-60
-,NIC,BOP,DT3.1,N,BE,N,48
-,NIC,CF,DT3.1,N,BE,N,-12
-,NIC,EV,DT3.1,N,BE,N,45
+,NIC,CL,DT3.1,N,BE,C,-130.5
+,NIC,BOP,DT3.1,N,BE,I,150
+,NIC,CF,DT3.1,N,BE,I,-30
+,NIC,MC,DT3.1,N,BE,I,-30
+,NIC,BOP,DT3.1,N,BE,N,24
+,NIC,CF,DT3.1,N,BE,N,-6
+,NIC,EV,DT3.1,N,BE,N,22.5
 ,PR,CL,DT3.1,N,BE,C,345
 ,PR,BOP,DT3.1,N,BE,I,-400
 ,PR,CF,DT3.1,N,BE,I,110
@@ -433,20 +589,30 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,BOP,DT3.1,N,BE,N,-40
 ,PR,CF,DT3.1,N,BE,N,10
 ,PR,EV,DT3.1,N,BE,N,15
+,DAE,EOP,DT4.1,C,BE,C,130.22916
+,DAE,BOP,DT4.1,C,BE,I,149.83777
+,DAE,CF,DT4.1,C,BE,I,-30
+,DAE,IA,DT4.1,C,BE,I,0.05489
+,DAE,MC,DT4.1,C,BE,I,-29.96755
+,DAE,YCU,DT4.1,C,BE,I,-0.1119
+,DAE,BOP,DT4.1,C,BE,N,23.93527
+,DAE,CF,DT4.1,C,BE,N,-6
+,DAE,EV,DT4.1,C,BE,N,22.4533
+,DAE,IA,DT4.1,C,BE,N,0.02737
 ,ICO,EOP,DT4.1,C,BE,C,8.98132
 ,ICO,BOP,DT4.1,C,BE,N,11.96764
 ,ICO,CF,DT4.1,C,BE,N,-3
 ,ICO,IA,DT4.1,C,BE,N,0.01368
-,NIC,EOP,DT4.1,C,BE,C,260.45832
-,NIC,BOP,DT4.1,C,BE,I,299.67555
-,NIC,CF,DT4.1,C,BE,I,-60
-,NIC,IA,DT4.1,C,BE,I,0.10979
-,NIC,MC,DT4.1,C,BE,I,-59.93511
-,NIC,YCU,DT4.1,C,BE,I,-0.2238
-,NIC,BOP,DT4.1,C,BE,N,47.87055
-,NIC,CF,DT4.1,C,BE,N,-12
-,NIC,EV,DT4.1,C,BE,N,44.90661
-,NIC,IA,DT4.1,C,BE,N,0.05474
+,NIC,EOP,DT4.1,C,BE,C,130.22916
+,NIC,BOP,DT4.1,C,BE,I,149.83777
+,NIC,CF,DT4.1,C,BE,I,-30
+,NIC,IA,DT4.1,C,BE,I,0.05489
+,NIC,MC,DT4.1,C,BE,I,-29.96755
+,NIC,YCU,DT4.1,C,BE,I,-0.1119
+,NIC,BOP,DT4.1,C,BE,N,23.93527
+,NIC,CF,DT4.1,C,BE,N,-6
+,NIC,EV,DT4.1,C,BE,N,22.4533
+,NIC,IA,DT4.1,C,BE,N,0.02737
 ,PR,EOP,DT4.1,C,BE,C,-428.2876
 ,PR,BOP,DT4.1,C,BE,I,-399.63393
 ,PR,CF,DT4.1,C,BE,I,110
@@ -457,19 +623,28 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT4.1,C,BE,N,20
 ,PR,EV,DT4.1,C,BE,N,-38.93524
 ,PR,IA,DT4.1,C,BE,N,-0.08295
+,DAE,EOP,DT4.1,L,BE,C,130.39142
+,DAE,BOP,DT4.1,L,BE,I,149.83777
+,DAE,CF,DT4.1,L,BE,I,-30
+,DAE,IA,DT4.1,L,BE,I,0.05489
+,DAE,MC,DT4.1,L,BE,I,-29.96755
+,DAE,BOP,DT4.1,L,BE,N,23.97404
+,DAE,CF,DT4.1,L,BE,N,-6
+,DAE,EV,DT4.1,L,BE,N,22.48128
+,DAE,IA,DT4.1,L,BE,N,0.01098
 ,ICO,EOP,DT4.1,L,BE,C,8.99251
 ,ICO,BOP,DT4.1,L,BE,N,11.98702
 ,ICO,CF,DT4.1,L,BE,N,-3
 ,ICO,IA,DT4.1,L,BE,N,0.00549
-,NIC,EOP,DT4.1,L,BE,C,260.78283
-,NIC,BOP,DT4.1,L,BE,I,299.67555
-,NIC,CF,DT4.1,L,BE,I,-60
-,NIC,IA,DT4.1,L,BE,I,0.10979
-,NIC,MC,DT4.1,L,BE,I,-59.93511
-,NIC,BOP,DT4.1,L,BE,N,47.94809
-,NIC,CF,DT4.1,L,BE,N,-12
-,NIC,EV,DT4.1,L,BE,N,44.96256
-,NIC,IA,DT4.1,L,BE,N,0.02196
+,NIC,EOP,DT4.1,L,BE,C,130.39142
+,NIC,BOP,DT4.1,L,BE,I,149.83777
+,NIC,CF,DT4.1,L,BE,I,-30
+,NIC,IA,DT4.1,L,BE,I,0.05489
+,NIC,MC,DT4.1,L,BE,I,-29.96755
+,NIC,BOP,DT4.1,L,BE,N,23.97404
+,NIC,CF,DT4.1,L,BE,N,-6
+,NIC,EV,DT4.1,L,BE,N,22.48128
+,NIC,IA,DT4.1,L,BE,N,0.01098
 ,PR,EOP,DT4.1,L,BE,C,-428.71442
 ,PR,BOP,DT4.1,L,BE,I,-399.63393
 ,PR,CF,DT4.1,L,BE,I,110
@@ -479,16 +654,23 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT4.1,L,BE,N,20
 ,PR,EV,DT4.1,L,BE,N,-38.97404
 ,PR,IA,DT4.1,L,BE,N,-0.03327
+,DAE,EOP,DT4.1,N,BE,C,130.5
+,DAE,BOP,DT4.1,N,BE,I,150
+,DAE,CF,DT4.1,N,BE,I,-30
+,DAE,MC,DT4.1,N,BE,I,-30
+,DAE,BOP,DT4.1,N,BE,N,24
+,DAE,CF,DT4.1,N,BE,N,-6
+,DAE,EV,DT4.1,N,BE,N,22.5
 ,ICO,EOP,DT4.1,N,BE,C,9
 ,ICO,BOP,DT4.1,N,BE,N,12
 ,ICO,CF,DT4.1,N,BE,N,-3
-,NIC,EOP,DT4.1,N,BE,C,261
-,NIC,BOP,DT4.1,N,BE,I,300
-,NIC,CF,DT4.1,N,BE,I,-60
-,NIC,MC,DT4.1,N,BE,I,-60
-,NIC,BOP,DT4.1,N,BE,N,48
-,NIC,CF,DT4.1,N,BE,N,-12
-,NIC,EV,DT4.1,N,BE,N,45
+,NIC,EOP,DT4.1,N,BE,C,130.5
+,NIC,BOP,DT4.1,N,BE,I,150
+,NIC,CF,DT4.1,N,BE,I,-30
+,NIC,MC,DT4.1,N,BE,I,-30
+,NIC,BOP,DT4.1,N,BE,N,24
+,NIC,CF,DT4.1,N,BE,N,-6
+,NIC,EV,DT4.1,N,BE,N,22.5
 ,PR,EOP,DT4.1,N,BE,C,-429
 ,PR,BOP,DT4.1,N,BE,I,-400
 ,PR,CF,DT4.1,N,BE,I,110
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BEPA.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BEPA.csv
index 1e82d688..e9398dbe 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BEPA.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__BEPA.csv
@@ -7,13 +7,13 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,PR,CF,DT1.1,L,BEPA,N,8
 ,PR,CF,DT1.3,L,BEPA,I,110
 ,PR,CF,DT1.3,L,BEPA,N,10
+,PR,CF,DT1.4,L,BEPA,I,88
+,PR,CF,DT1.4,L,BEPA,N,8
+,PR,CF,DT1.5,L,BEPA,I,88
+,PR,CF,DT1.5,L,BEPA,N,8
 ,PR,CF,DT2.1,L,BEPA,I,88
 ,PR,CF,DT2.1,L,BEPA,N,8
 ,PR,CF,DT3.1,L,BEPA,I,88
 ,PR,CF,DT3.1,L,BEPA,N,8
 ,PR,CF,DT4.1,L,BEPA,I,88
-,PR,CF,DT4.1,L,BEPA,N,16
-,PR,CF,DT1.4,L,BEPA,I,88
-,PR,CF,DT1.4,L,BEPA,N,8
-,PR,CF,DT1.5,L,BEPA,I,88
-,PR,CF,DT1.5,L,BEPA,N,8
\ No newline at end of file
+,PR,CF,DT4.1,L,BEPA,N,16
\ No newline at end of file
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 8eb59fe9..1557d93f 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,51 +3,52 @@ Month,ReportingNode,Scenario,Year
 3,CH,,2021
 @@C
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,,AM,DT1.1,L,C,C,-6.28963
+,,AM,DT1.1,L,C,C,-14.22248
 ,,CL,DT1.1,L,C,C,-87.43136
-,,EA,DT1.1,L,C,C,-42
-,,EOP,DT1.1,L,C,C,13.21352
-,,BOP,DT1.1,L,C,I,42.96811
-,,IA,DT1.1,L,C,I,0.07437
+,,EA,DT1.1,L,C,C,-26
+,,EOP,DT1.1,L,C,C,29.87921
+,,BOP,DT1.1,L,C,I,51.56237
+,,IA,DT1.1,L,C,I,0.07867
 ,,MC,DT1.1,L,C,I,105.89201
-,,AM,DT1.3,L,C,C,-4.35467
+,,AM,DT1.3,L,C,C,-12.28752
 ,,CL,DT1.3,L,C,C,-87.43136
-,,EA,DT1.3,L,C,C,-48
-,,EOP,DT1.3,L,C,C,9.14848
-,,BOP,DT1.3,L,C,I,42.96811
-,,IA,DT1.3,L,C,I,0.07437
+,,EA,DT1.3,L,C,C,-32
+,,EOP,DT1.3,L,C,C,25.81417
+,,BOP,DT1.3,L,C,I,51.56237
+,,IA,DT1.3,L,C,I,0.07867
 ,,MC,DT1.3,L,C,I,105.89201
-,,AM,DT1.4,L,C,C,-6.28963
+,,AM,DT1.4,L,C,C,-14.22248
 ,,CL,DT1.4,L,C,C,-87.43136
-,,EA,DT1.4,L,C,C,-42
-,,EOP,DT1.4,L,C,C,13.21352
-,,BOP,DT1.4,L,C,I,42.96811
-,,IA,DT1.4,L,C,I,0.07437
+,,EA,DT1.4,L,C,C,-26
+,,EOP,DT1.4,L,C,C,29.87921
+,,BOP,DT1.4,L,C,I,51.56237
+,,IA,DT1.4,L,C,I,0.07867
 ,,MC,DT1.4,L,C,I,105.89201
-,,AM,DT1.5,L,C,C,-6.28963
+,,AM,DT1.5,L,C,C,-14.22248
 ,,CL,DT1.5,L,C,C,-87.43136
-,,EA,DT1.5,L,C,C,-42
-,,EOP,DT1.5,L,C,C,13.21352
-,,BOP,DT1.5,L,C,I,42.96811
-,,IA,DT1.5,L,C,I,0.07437
+,,EA,DT1.5,L,C,C,-26
+,,EOP,DT1.5,L,C,C,29.87921
+,,BOP,DT1.5,L,C,I,51.56237
+,,IA,DT1.5,L,C,I,0.07867
 ,,MC,DT1.5,L,C,I,105.89201
-,,AM,DT2.1,L,C,C,-6.28963
+,,AM,DT2.1,L,C,C,-14.22248
 ,,CL,DT2.1,L,C,C,-87.43136
-,,EA,DT2.1,L,C,C,-42
-,,EOP,DT2.1,L,C,C,13.21352
-,,BOP,DT2.1,L,C,I,42.96811
-,,IA,DT2.1,L,C,I,0.07437
+,,EA,DT2.1,L,C,C,-26
+,,EOP,DT2.1,L,C,C,29.87921
+,,BOP,DT2.1,L,C,I,51.56237
+,,IA,DT2.1,L,C,I,0.07867
 ,,MC,DT2.1,L,C,I,105.89201
+,,AM,DT3.1,L,C,C,-16.47025
 ,,CL,DT3.1,L,C,C,-139.94507
-,,EA,DT3.1,L,C,C,-33.8717
-,,BOP,DT3.1,L,C,I,67.83796
-,,IA,DT3.1,L,C,I,0.0868
+,,EA,DT3.1,L,C,C,-26
+,,BOP,DT3.1,L,C,I,76.43221
+,,IA,DT3.1,L,C,I,0.09109
 ,,MC,DT3.1,L,C,I,105.89201
-,,AM,DT4.1,L,C,C,-34.00598
-,,EA,DT4.1,L,C,C,-50
-,,EOP,DT4.1,L,C,C,71.44125
-,,BOP,DT4.1,L,C,I,42.96811
-,,IA,DT4.1,L,C,I,0.07437
+,,AM,DT4.1,L,C,C,-41.93883
+,,EA,DT4.1,L,C,C,-34
+,,EOP,DT4.1,L,C,C,88.10694
+,,BOP,DT4.1,L,C,I,51.56237
+,,IA,DT4.1,L,C,I,0.07867
 ,,MC,DT4.1,L,C,I,105.89201
 ,,BOP,DT4.1,L,C,N,8.00465
 ,,EV,DT4.1,L,C,N,-1.49226
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__DA.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__DA.csv
index bdbb7f9a..be2879ad 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__DA.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__DA.csv
@@ -3,30 +3,66 @@ Month,ReportingNode,Scenario,Year
 3,CH,,2021
 @@DA
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Values0
-,,EOP,DT4.1,,DA,C,-13.65621
-,,AM,DT4.1,,DA,C,6.50034
-,,BOP,DT4.1,,DA,I,-5.15655
-,,CF,DT4.1,,DA,C,-15
-,,AM,DT3.1,,DA,C,20.15655
-,,BOP,DT3.1,,DA,I,-5.15655
-,,CF,DT3.1,,DA,C,-15
-,,CF,DT1.1,,DA,C,-15
-,,BOP,DT1.1,,DA,I,-5.15655
-,,AM,DT1.1,,DA,C,6.50034
-,,EOP,DT1.1,,DA,C,-13.65621
-,,CF,DT1.3,,DA,C,-15
-,,BOP,DT1.3,,DA,I,-5.15655
-,,AM,DT1.3,,DA,C,6.50034
-,,EOP,DT1.3,,DA,C,-13.65621
-,,CF,DT2.1,,DA,C,-15
-,,BOP,DT2.1,,DA,I,-5.15655
-,,AM,DT2.1,,DA,C,6.50034
-,,EOP,DT2.1,,DA,C,-13.65621
-,,CF,DT1.4,,DA,C,-15
-,,BOP,DT1.4,,DA,I,-5.15655
-,,AM,DT1.4,,DA,C,6.50034
-,,EOP,DT1.4,,DA,C,-13.65621
-,,CF,DT1.5,,DA,C,-15
-,,BOP,DT1.5,,DA,I,-5.15655
-,,AM,DT1.5,,DA,C,6.50034
-,,EOP,DT1.5,,DA,C,-13.65621
\ No newline at end of file
+,,AM,DT1.1,L,DA,C,-37.14187
+,,EA,DT1.1,L,DA,C,-1
+,,EOP,DT1.1,L,DA,C,78.02926
+,,BOP,DT1.1,L,DA,I,99.63757
+,,IA,DT1.1,L,DA,I,0.03481
+,,MC,DT1.1,L,DA,I,-29.96755
+,,BOP,DT1.1,L,DA,N,23.97404
+,,EV,DT1.1,L,DA,N,22.48128
+,,IA,DT1.1,L,DA,N,0.01098
+,,AM,DT1.3,L,DA,C,-37.14187
+,,EA,DT1.3,L,DA,C,-1
+,,EOP,DT1.3,L,DA,C,78.02926
+,,BOP,DT1.3,L,DA,I,99.63757
+,,IA,DT1.3,L,DA,I,0.03481
+,,MC,DT1.3,L,DA,I,-29.96755
+,,BOP,DT1.3,L,DA,N,23.97404
+,,EV,DT1.3,L,DA,N,22.48128
+,,IA,DT1.3,L,DA,N,0.01098
+,,AM,DT1.4,L,DA,C,-37.14187
+,,EA,DT1.4,L,DA,C,-1
+,,EOP,DT1.4,L,DA,C,78.02926
+,,BOP,DT1.4,L,DA,I,99.63757
+,,IA,DT1.4,L,DA,I,0.03481
+,,MC,DT1.4,L,DA,I,-29.96755
+,,BOP,DT1.4,L,DA,N,23.97404
+,,EV,DT1.4,L,DA,N,22.48128
+,,IA,DT1.4,L,DA,N,0.01098
+,,AM,DT1.5,L,DA,C,-37.14187
+,,EA,DT1.5,L,DA,C,-1
+,,EOP,DT1.5,L,DA,C,78.02926
+,,BOP,DT1.5,L,DA,I,99.63757
+,,IA,DT1.5,L,DA,I,0.03481
+,,MC,DT1.5,L,DA,I,-29.96755
+,,BOP,DT1.5,L,DA,N,23.97404
+,,EV,DT1.5,L,DA,N,22.48128
+,,IA,DT1.5,L,DA,N,0.01098
+,,AM,DT2.1,L,DA,C,-37.14187
+,,EA,DT2.1,L,DA,C,-1
+,,EOP,DT2.1,L,DA,C,78.02926
+,,BOP,DT2.1,L,DA,I,99.63757
+,,IA,DT2.1,L,DA,I,0.03481
+,,MC,DT2.1,L,DA,I,-29.96755
+,,BOP,DT2.1,L,DA,N,23.97404
+,,EV,DT2.1,L,DA,N,22.48128
+,,IA,DT2.1,L,DA,N,0.01098
+,,AM,DT3.1,L,DA,C,19.01122
+,,CL,DT3.1,L,DA,C,-130.39142
+,,EA,DT3.1,L,DA,C,-1
+,,BOP,DT3.1,L,DA,I,95.84854
+,,IA,DT3.1,L,DA,I,0.03292
+,,MC,DT3.1,L,DA,I,-29.96755
+,,BOP,DT3.1,L,DA,N,23.97404
+,,EV,DT3.1,L,DA,N,22.48128
+,,IA,DT3.1,L,DA,N,0.01098
+,,AM,DT4.1,L,DA,C,-37.14187
+,,EA,DT4.1,L,DA,C,-1
+,,EOP,DT4.1,L,DA,C,78.02926
+,,BOP,DT4.1,L,DA,I,99.63757
+,,IA,DT4.1,L,DA,I,0.03481
+,,MC,DT4.1,L,DA,I,-29.96755
+,,BOP,DT4.1,L,DA,N,23.97404
+,,EV,DT4.1,L,DA,N,22.48128
+,,IA,DT4.1,L,DA,N,0.01098
\ No newline at end of file
diff --git a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__L.csv b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__L.csv
index 56818f58..b9afe170 100644
--- a/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__L.csv
+++ b/ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3__L.csv
@@ -23,9 +23,7 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,,BOP,DT2.1,L,L,N,31.95874
 ,,EV,DT2.1,L,L,N,55.45632
 ,,IA,DT2.1,L,L,N,0.0163
-,,AM,DT3.1,L,L,C,-8.1283
 ,,CL,DT3.1,L,L,C,-87.43136
-,,EA,DT3.1,L,L,C,8.1283
 ,,BOP,DT3.1,L,L,N,31.95874
 ,,EV,DT3.1,L,L,N,55.45632
 ,,IA,DT3.1,L,L,N,0.0163
\ 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 df0cb408..4f4b64bd 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
@@ -123,12 +123,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,P11,CH,MTUP10pct,CurrentService,BBA,15,CF
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,P11,CH,MTUP10pct,CurrentService,BBA,-14.98378,EOP
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,P11,CH,MTUP10pct,CurrentService,BBA,-0.04613,IA
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-310,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-310,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -137,6 +132,11 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,320,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.5387,OCI1
 0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,658.62824,BOP
 0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-330,CF
 0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,329.6431,EOP
@@ -147,6 +147,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,399.63393,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.5387,OCI1
 0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,658.62824,BOP
 0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-330,CF
 0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,329.6431,EOP
@@ -163,19 +170,30 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-42.67021,AM
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,80.0332,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,22.35306,EOP
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.00993,IA
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.00993,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,42.67021,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-65.0332,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,AM
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,BOP
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,EA
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,IA
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,190.2002,ISE6
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-137.68654,AM
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,219.34327,BOP
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,72.12796,EOP
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.47123,IA
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.47123,IFIE1
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,71.65673,IR5
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-209.8145,ISE11
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,137.68654,ISE9
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,EOP
@@ -188,12 +206,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-310,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-310,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -202,23 +215,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-400,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
@@ -228,19 +253,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,190.2002,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,EOP
@@ -253,12 +280,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -271,23 +293,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,AA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,15,CF
 0,PR,2020,USD,USD,,AA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,15,EOP
 0,PR,2020,USD,USD,,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
@@ -297,19 +331,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,190.2002,ISE6
 0,NIC,2020,USD,USD,,OA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,8,CF
 0,NIC,2020,USD,USD,,OA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,8,EOP
 0,PR,2020,USD,USD,,OA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
@@ -326,12 +362,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -340,23 +371,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
@@ -366,19 +409,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,190.2002,ISE6
 0,PR,2020,USD,USD,,OA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
 0,PR,2020,USD,USD,,OA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EOP
 0,,2020,USD,USD,C,RA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,59.87529,BOP
@@ -393,12 +438,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-310,CF
 0,NIC,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-310,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -407,12 +447,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-298.75294,IR5
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-0,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-149.37647,IR5
 0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -422,29 +469,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,398.53673,IR5
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-400,IR79
-0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
+0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-0,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,320,IR79
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,190.2002,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,EOP
@@ -456,12 +509,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,EOP
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,MTUP10pct,NotApplicable,BBA,0.09226,IA
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -472,23 +520,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,AA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-1.5,BOP
 0,PR,2020,USD,USD,,AA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-1.5,EOP
 0,PR,2020,USD,USD,,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
@@ -498,21 +558,25 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-129.49727,AM
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-145.90301,AM
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,72.2,BOP
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,67.83796,EOP
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,76.43221,EOP
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.1444,IA
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-0.22673,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,129.49727,IR3
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,145.90301,IR3
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-182.96724,AM
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-11,BOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,95.84854,EOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-0.022,IA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-182.96724,IR4
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,182.96724,ISE6
 0,PR,2020,USD,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,1.5,BOP
 0,PR,2020,USD,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,1.5,EOP
 0,,2020,USD,USD,C,RA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,59.87529,BOP
@@ -527,12 +591,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
@@ -541,23 +600,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,EOP
@@ -567,19 +638,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,190.2002,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,EOP
@@ -640,11 +713,12 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,,C,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-0.08233,IFIE1
 0,,2020,USD,USD,,C,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,82.02271,IR3
 0,,2020,USD,USD,,C,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,9.85821,AM
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-15,BOP
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-5.16429,EOP
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-0.0225,IA
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,9.85821,IR4
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-9.85821,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,MTUP10pct,NotApplicable,BBA,29.96755,EOP
@@ -704,6 +778,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.00487,IFIE1
 0,,2020,USD,USD,L,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,40.06074,ISE10
 0,,2020,USD,USD,L,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,-26.28586,ISE7
+0,,2020,USD,USD,L,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,68.84327,AM
+0,,2020,USD,USD,L,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,-109.67164,BOP
+0,,2020,USD,USD,L,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,4.76925,EA
+0,,2020,USD,USD,L,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,-36.06398,EOP
+0,,2020,USD,USD,L,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,-0.00487,IA
+0,,2020,USD,USD,L,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,104.90725,ISE11
+0,,2020,USD,USD,L,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,-68.84327,ISE8
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,-29.93765,BOP
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,BBA,15,CF
 0,,2020,USD,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,P11,CH,MTUP10pct,NotApplicable,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 5232f077..e6304a73 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
@@ -123,12 +123,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,P11,CH,,CurrentService,BBA,15,CF
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,C,,PT1,DTR2,P11,CH,,CurrentService,BBA,-14.98378,EOP
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,P11,CH,,CurrentService,BBA,-0.04613,IA
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
@@ -137,23 +132,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
@@ -163,19 +170,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,190.2002,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,29.96755,EOP
@@ -188,12 +197,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
@@ -202,23 +206,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,0,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-400,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
@@ -228,19 +244,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,0,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,190.2002,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,29.96755,EOP
@@ -253,12 +271,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
@@ -271,23 +284,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,AA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,15,CF
 0,PR,2020,USD,USD,,AA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,15,EOP
 0,PR,2020,USD,USD,,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
@@ -297,19 +322,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,190.2002,ISE6
 0,NIC,2020,USD,USD,,OA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,8,CF
 0,NIC,2020,USD,USD,,OA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,8,EOP
 0,PR,2020,USD,USD,,OA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,CF
@@ -326,12 +353,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
@@ -340,23 +362,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,EOP
@@ -366,19 +400,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,190.2002,ISE6
 0,PR,2020,USD,USD,,OA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,CF
 0,PR,2020,USD,USD,,OA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-10,EOP
 0,,2020,USD,USD,C,RA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P11,CH,,NotApplicable,BBA,59.87529,BOP
@@ -393,12 +429,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P11,CH,,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,400,CF
@@ -407,12 +438,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-298.75294,IR5
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-0,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-149.37647,IR5
 0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,0,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,400,CF
@@ -422,29 +460,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,398.53673,IR5
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-400,IR79
-0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,0,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.92261,IA
+0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-0,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.4613,IA
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,320,IR79
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,190.2002,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,29.96755,EOP
@@ -456,12 +500,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P11,CH,,NotApplicable,BBA,29.96755,EOP
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P11,CH,,NotApplicable,BBA,0.09226,IA
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,400,CF
@@ -472,23 +511,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,AA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,,NotApplicable,BBA,-1.5,BOP
 0,PR,2020,USD,USD,,AA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-1.5,EOP
 0,PR,2020,USD,USD,,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-399.63393,EOP
@@ -498,21 +549,25 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-129.49727,AM
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-145.90301,AM
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,,NotApplicable,BBA,72.2,BOP
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,67.83796,EOP
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,76.43221,EOP
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,,NotApplicable,BBA,0.1444,IA
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-0.22673,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,129.49727,IR3
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,145.90301,IR3
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-182.96724,AM
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,,NotApplicable,BBA,-11,BOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,95.84854,EOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,,NotApplicable,BBA,-0.022,IA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-182.96724,IR4
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,182.96724,ISE6
 0,PR,2020,USD,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P11,CH,,NotApplicable,BBA,1.5,BOP
 0,PR,2020,USD,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,1.5,EOP
 0,,2020,USD,USD,C,RA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P11,CH,,NotApplicable,BBA,59.87529,BOP
@@ -527,12 +582,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-0.09226,IFIE1
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,-29.87529,IR5
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P11,CH,,NotApplicable,BBA,29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-140,CF
 0,NIC,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-280,CF
 0,NIC,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-280,ISE2
 0,PR,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,400,CF
@@ -541,23 +591,35 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,80,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-320,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,320,IR78
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-299.67555,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,149.5387,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-399.63393,EOP
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-1.0972,IA
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,399.63393,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,598.75294,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-300,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,299.67555,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.92261,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-0.92261,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-298.75294,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,299.67555,OCI1
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-150,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,150,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-149.5387,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-150,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,149.83777,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-0.4613,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-149.37647,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-798.53673,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,400,CF
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-399.63393,EOP
@@ -567,19 +629,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,400,IR77
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-80,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-82.02271,AM
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-98.42846,AM
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,139.90849,BOP
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-15,EA
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,42.96811,EOP
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,10,EA
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,51.56237,EOP
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.08233,IA
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-0.08233,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,82.02271,IR3
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,98.42846,IR3
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-149.90849,IR5
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-190.2002,AM
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,299.37647,BOP
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-10,EA
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,99.63757,EOP
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,0.4613,IA
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,-190.2002,IR4
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,190.2002,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P11,CH,,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P11,CH,,NotApplicable,BBA,29.96755,EOP
@@ -640,11 +704,12 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,,C,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,-0.08233,IFIE1
 0,,2020,USD,USD,,C,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,82.02271,IR3
 0,,2020,USD,USD,,C,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,-124.90849,IR5
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,9.84345,AM
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,-5.15655,EOP
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,9.84345,IR4
-0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,-9.84345,ISE6
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,9.85821,AM
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,,NotApplicable,BBA,-15,BOP
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,-5.16429,EOP
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,,NotApplicable,BBA,-0.0225,IA
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,9.85821,IR4
+0,,2020,USD,USD,,DA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,-9.85821,ISE6
 0,,2020,USD,USD,C,RA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,,NotApplicable,BBA,59.87529,BOP
 0,,2020,USD,USD,C,RA,CHF,DT5.1,P,False,LRC,ANN,N,Default,,DT5,P11,CH,,NotApplicable,BBA,-30,CF
 0,,2020,USD,USD,C,RA,CHF,DT5.1,P,False,LRC,ANN,C,Default,,DT5,P11,CH,,NotApplicable,BBA,29.96755,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 e59b6fee..5eda5d8d 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
@@ -231,12 +231,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,P2,CH,,PastService,BBA,-0.00549,IA
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,N,,PT1,DTR2,P2,CH,,PastService,BBA,-0.00274,IA
 2020,,2020,USD,USD,L,RA,CHF,DTR2.2,P,True,LIC,ANN,I,,PT1,DTR2,P2,CH,,PastService,BBA,2.99676,MC
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-35,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,IR2
 0,ICO,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,ISE2
@@ -249,22 +244,33 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,18,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-96,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,72,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.54389,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.98132,EOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01368,IA
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98132,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.87055,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.45832,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.90661,EV
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05474,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.21723,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.2238,YCU
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.60862,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.9087,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -276,6 +282,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-55.20684,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.32832,YCU
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.48628,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-43.4204,OCI1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.98702,BOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,EOP
@@ -283,18 +301,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.00549,IFIE1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98702,IR5
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.94809,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.78283,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.96256,EV
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02196,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.13175,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.02446,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-38.89272,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.51223,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-19.44636,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -309,22 +327,27 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-24,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,L,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,54.86359,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6.28963,AM
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,42.96811,BOP
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-14.22248,AM
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,51.56237,BOP
 0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-42,EA
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,13.21352,EOP
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07437,IA
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07437,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.28963,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,23.53934,IR5
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-26,EA
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,29.87921,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07867,IA
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07867,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,14.22248,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,7.53934,IR5
 0,,2020,USD,USD,L,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,105.89201,MC
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,AM
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.15655,BOP
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-13.65621,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6.50034,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,99.63757,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-1,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,78.02926,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.03481,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,37.14187,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,31.95874,BOP
 0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
 0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0,EOP
@@ -332,7 +355,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.0163,IA
 0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0.0163,IFIE1
 0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.0163,IR5
-0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0,ISE11
+0,,2020,USD,USD,L,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0,ISE11
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,29.96755,BOP
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,,2020,USD,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
@@ -356,12 +379,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,7.50274,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.99351,MC
 0,,2020,USD,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-7.48628,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-35,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,IR2
 0,ICO,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,ISE2
@@ -374,22 +392,33 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-120,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,90,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.54389,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.98132,EOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01368,IA
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98132,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.87055,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.45832,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.90661,EV
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05474,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.21723,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.2238,YCU
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.60862,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.9087,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -401,6 +430,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-55.20684,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.32832,YCU
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.48628,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-43.4204,OCI1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.98702,BOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,EOP
@@ -408,18 +449,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.00549,IFIE1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98702,IR5
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.94809,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.78283,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.96256,EV
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02196,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.13175,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.02446,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-38.89272,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.51223,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-19.44636,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -434,22 +475,27 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,L,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,54.86359,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-4.35467,AM
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,42.96811,BOP
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-12.28752,AM
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,51.56237,BOP
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-48,EA
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,9.14848,EOP
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07437,IA
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07437,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,4.35467,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,29.53934,IR5
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-32,EA
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,25.81417,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07867,IA
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07867,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,12.28752,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,13.53934,IR5
 0,,2020,USD,USD,L,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,105.89201,MC
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,AM
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.15655,BOP
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-13.65621,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6.50034,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,99.63757,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-1,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,78.02926,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.03481,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,37.14187,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,,2020,USD,USD,L,L,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,31.95874,BOP
 0,,2020,USD,USD,L,L,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
 0,,2020,USD,USD,L,L,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0,EOP
@@ -481,12 +527,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,7.50274,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.99351,MC
 0,,2020,USD,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-7.48628,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-35,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,IR2
 0,ICO,2020,USD,USD,,A,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,ISE2
@@ -506,22 +547,33 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,AA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,5,CF
 0,PR,2020,USD,USD,,AA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,20,EOP
 0,PR,2020,USD,USD,,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,72,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.54389,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.98132,EOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01368,IA
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98132,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.87055,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.45832,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.90661,EV
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05474,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.21723,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.2238,YCU
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.60862,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.9087,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -533,6 +585,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-55.20684,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.32832,YCU
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.48628,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-43.4204,OCI1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.98702,BOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,EOP
@@ -540,18 +604,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.00549,IFIE1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98702,IR5
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.94809,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.78283,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.96256,EV
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02196,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.13175,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.02446,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-38.89272,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.51223,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-19.44636,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -566,22 +630,27 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-24,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,L,BE,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,54.86359,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6.28963,AM
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,42.96811,BOP
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-14.22248,AM
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,51.56237,BOP
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-42,EA
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,13.21352,EOP
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07437,IA
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07437,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.28963,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,23.53934,IR5
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-26,EA
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,29.87921,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07867,IA
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07867,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,14.22248,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,7.53934,IR5
 0,,2020,USD,USD,L,C,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,105.89201,MC
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,AM
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.15655,BOP
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-13.65621,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6.50034,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,99.63757,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-1,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,78.02926,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.03481,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,37.14187,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,,2020,USD,USD,L,L,CHF,DT1.4,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,31.95874,BOP
 0,,2020,USD,USD,L,L,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
 0,,2020,USD,USD,L,L,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0,EOP
@@ -621,12 +690,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,7.50274,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.99351,MC
 0,,2020,USD,USD,L,RA,CHF,DT1.4,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-7.48628,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-35,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
 0,ICO,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,IR2
 0,ICO,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,ISE2
@@ -639,22 +703,33 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,18,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-96,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,72,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.54389,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.98132,EOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01368,IA
 0,ICO,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98132,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.87055,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.45832,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.90661,EV
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05474,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.21723,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.2238,YCU
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.60862,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.9087,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -666,6 +741,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-55.20684,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.32832,YCU
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,43.48628,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-43.4204,OCI1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,11.98702,BOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,EOP
@@ -673,18 +760,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.00549,IFIE1
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-8.98702,IR5
 0,ICO,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,8.99251,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,47.94809,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,260.78283,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,44.96256,EV
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.02196,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.13175,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,39.02446,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-38.89272,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,19.51223,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-19.44636,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,110,CF
@@ -699,22 +786,27 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-24,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,L,BE,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,54.86359,OCI1
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6.28963,AM
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,42.96811,BOP
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-14.22248,AM
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,51.56237,BOP
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-42,EA
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,13.21352,EOP
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07437,IA
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07437,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.28963,IR3
-0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,23.53934,IR5
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-26,EA
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,29.87921,EOP
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.07867,IA
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-0.07867,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,14.22248,IR3
+0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,7.53934,IR5
 0,,2020,USD,USD,L,C,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,105.89201,MC
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,AM
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.15655,BOP
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-13.65621,EOP
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,6.50034,IR4
-0,,2020,USD,USD,,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-6.50034,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,AM
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,99.63757,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-1,EA
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,78.02926,EOP
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,0.03481,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-37.14187,IR4
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,37.14187,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,,2020,USD,USD,L,L,CHF,DT1.5,P,False,LRC,ANN,N,Default,,DT1,P2,CH,,NotApplicable,BBA,31.95874,BOP
 0,,2020,USD,USD,L,L,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-87.43136,CL
 0,,2020,USD,USD,L,L,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,0,EOP
@@ -750,12 +842,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,7.50274,IR5
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,I,Default,,DT1,P2,CH,,NotApplicable,BBA,-5.99351,MC
 0,,2020,USD,USD,L,RA,CHF,DT1.5,P,False,LRC,ANN,C,Default,,DT1,P2,CH,,NotApplicable,BBA,-7.48628,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-35,CF
 0,ICO,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-6,CF
 0,ICO,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-6,IR2
 0,ICO,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-6,ISE2
@@ -768,6 +855,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,18,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-96,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,72,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0.02964,IFIE1
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,43.51425,IR5
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,ICO,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,8.98132,EOP
@@ -775,19 +875,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,ICO,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-0.01368,IFIE1
 0,ICO,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-8.96764,IR5
 0,ICO,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,47.87055,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,260.45832,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,44.90661,EV
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.05474,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0.05928,IFIE1
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,39.15796,IR5
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-59.93511,MC
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0.02964,IFIE1
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,19.57898,IR5
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-0.2238,YCU
+0,NIC,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-39.9087,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,110,CF
@@ -803,19 +903,28 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.32832,YCU
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,ICO,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,11.98702,BOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,8.99251,EOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.00549,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,47.94809,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,260.78283,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,44.96256,EV
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.02196,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-59.93511,MC
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-39.96339,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,110,CF
@@ -826,22 +935,27 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,-0.01664,IA
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,96,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-39.96339,MC
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-6.28963,AM
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,42.96811,BOP
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-14.22248,AM
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,51.56237,BOP
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-87.43136,CL
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-42,EA
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,13.21352,EOP
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.07437,IA
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-0.07437,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,6.28963,IR3
-0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,23.53934,IR5
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-26,EA
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,29.87921,EOP
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.07867,IA
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-0.07867,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,14.22248,IR3
+0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,7.53934,IR5
 0,,2020,USD,USD,L,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,105.89201,MC
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,6.50034,AM
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-5.15655,BOP
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-13.65621,EOP
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,6.50034,IR4
-0,,2020,USD,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-6.50034,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-37.14187,AM
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,99.63757,BOP
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-1,EA
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,78.02926,EOP
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.03481,IA
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-37.14187,IR4
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,37.14187,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,,2020,USD,USD,L,L,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,31.95874,BOP
 0,,2020,USD,USD,L,L,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,-87.43136,CL
 0,,2020,USD,USD,L,L,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,P2,CH,,NotApplicable,BBA,0,EOP
@@ -872,12 +986,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,0.01098,IA
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,P2,CH,,NotApplicable,BBA,0.00549,IA
 0,,2020,USD,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,P2,CH,,NotApplicable,BBA,-5.99351,MC
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-35,CF
 0,ICO,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-6,CF
 0,ICO,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-6,IR2
 0,ICO,2020,USD,USD,,A,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-6,ISE2
@@ -892,24 +1001,36 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,AA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-1.5,BOP
 0,PR,2020,USD,USD,,AA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-1.5,EOP
 0,PR,2020,USD,USD,,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,72,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-130.22916,CL
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,173.77305,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,ICO,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-8.98132,CL
 0,ICO,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.01368,IA
 0,ICO,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,47.87055,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-260.45832,CL
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-130.22916,CL
 0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,44.90661,EV
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.05474,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,299.67555,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.2238,YCU
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,149.83777,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-39.9087,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,110,CF
@@ -922,6 +1043,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-399.63393,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.32832,YCU
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-130.39142,CL
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,173.87769,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-173.81182,OCI1
 0,ICO,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,11.98702,BOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-8.99251,CL
@@ -930,19 +1064,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,ICO,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.00549,IFIE1
 0,ICO,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0.00549,IR5
 0,ICO,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,47.94809,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-260.78283,CL
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-130.39142,CL
 0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,44.96256,EV
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.02196,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.13175,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,299.8073,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-299.67555,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,149.90365,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-149.83777,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,-39.96339,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,110,CF
@@ -958,31 +1092,36 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-24,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,L,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,399.63393,OCI1
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,67.83796,BOP
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-16.47025,AM
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,76.43221,BOP
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-139.94507,CL
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-33.8717,EA
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-26,EA
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.0868,IA
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.0868,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,67.92476,IR5
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.09109,IA
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.09109,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,16.47025,IR3
+0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,60.05305,IR5
 0,,2020,USD,USD,L,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,105.89201,MC
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,20.15655,AM
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-5.15655,BOP
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,20.15655,IR4
-0,,2020,USD,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-20.15655,ISE6
-0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-8.1283,AM
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,19.01122,AM
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,95.84854,BOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-130.39142,CL
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-1,EA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,0.03292,IA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,19.01122,IR4
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-19.01122,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,31.95874,BOP
 0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-87.43136,CL
-0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,8.1283,EA
 0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,EOP
 0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,55.45632,EV
 0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,P2,CH,,NotApplicable,BBA,0.0163,IA
 0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0.0163,IFIE1
 0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-0.0163,IR5
-0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-8.1283,ISE11
-0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,8.1283,ISE9
+0,,2020,USD,USD,L,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,0,ISE11
 0,PR,2020,USD,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,1.5,BOP
 0,PR,2020,USD,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,1.5,EOP
 0,,2020,USD,USD,C,RA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,29.96755,BOP
@@ -1010,12 +1149,7 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,29.98402,IR5
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,P2,CH,,NotApplicable,BBA,-5.99351,MC
 0,,2020,USD,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,P2,CH,,NotApplicable,BBA,-29.96755,OCI1
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-10,CF
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-10,IR8
-0,ACA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-10,ISE4
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-5,CF
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-5,IR8
-0,AEA,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-5,ISE3
+0,DAE,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-35,CF
 0,ICO,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,CF
 0,ICO,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,IR2
 0,ICO,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,ISE2
@@ -1028,22 +1162,33 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,18,IR79
 0,PR,2020,USD,USD,L,A,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-104,IR78
 0,PR,2020,USD,USD,,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,72,IR78
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,43.54389,OCI1
+0,DAE,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,ICO,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,8.98132,EOP
 0,ICO,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.01368,IA
 0,ICO,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-8.98132,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,47.87055,BOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,260.45832,EOP
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,44.90661,EV
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.05474,IA
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,39.21723,OCI1
-0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.2238,YCU
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,23.93527,BOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,130.22916,EOP
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,22.4533,EV
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.02737,IA
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,19.60862,OCI1
+0,NIC,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.1119,YCU
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-79.81741,BOP
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,110,CF
@@ -1055,6 +1200,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,28.65367,OCI1
 0,PR,2020,USD,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.32832,YCU
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-30,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,CF
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,43.48628,IR5
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,DAE,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-43.4204,OCI1
 0,ICO,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,11.98702,BOP
 0,ICO,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-3,CF
 0,ICO,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,8.99251,EOP
@@ -1062,18 +1219,18 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,ICO,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.00549,IFIE1
 0,ICO,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-8.98702,IR5
 0,ICO,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,8.99251,OCI1
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,299.67555,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,47.94809,BOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-60,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-12,CF
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,260.78283,EOP
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,44.96256,EV
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.10979,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.02196,IA
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.13175,IFIE1
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,39.02446,IR5
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-59.93511,MC
-0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-38.89272,OCI1
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,149.83777,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-30,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,CF
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,130.39142,EOP
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.05489,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.06587,IFIE1
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,19.51223,IR5
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-29.96755,MC
+0,NIC,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-19.44636,OCI1
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-399.63393,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-79.92679,BOP
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,110,CF
@@ -1088,24 +1245,29 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,Currency,EconomicBasis,
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-26,IR79
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-39.96339,MC
 0,PR,2020,USD,USD,L,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-29.08049,OCI1
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-34.00598,AM
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,42.96811,BOP
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-41.93883,AM
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,51.56237,BOP
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,8.00465,BOP
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-50,EA
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,71.44125,EOP
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-34,EA
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,88.10694,EOP
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,-1.49226,EV
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.07437,IA
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.07867,IA
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.00034,IA
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.07471,IFIE1
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,34.00598,IR3
-0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-62.4044,IR5
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-0.079,IFIE1
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,41.93883,IR3
+0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-78.4044,IR5
 0,,2020,USD,USD,L,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,105.89201,MC
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,6.50034,AM
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-5.15655,BOP
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-15,CF
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-13.65621,EOP
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,6.50034,IR4
-0,,2020,USD,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-6.50034,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-37.14187,AM
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,99.63757,BOP
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,23.97404,BOP
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-1,EA
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,78.02926,EOP
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,22.48128,EV
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,0.03481,IA
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,0.01098,IA
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,-37.14187,IR4
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,P2,CH,,NotApplicable,BBA,37.14187,ISE6
+0,,2020,USD,USD,L,DA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-29.96755,MC
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,29.96755,BOP
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,P2,CH,,NotApplicable,BBA,11.96764,BOP
 0,,2020,USD,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,P2,CH,,NotApplicable,BBA,-6,CF
diff --git a/ifrs17-template/Test/IfrsVariablesTest.ipynb b/ifrs17-template/Test/IfrsVariablesTest.ipynb
index 520c634d..8ad621da 100644
--- a/ifrs17-template/Test/IfrsVariablesTest.ipynb
+++ b/ifrs17-template/Test/IfrsVariablesTest.ipynb
@@ -126,8 +126,9 @@
         {
             "cell_type": "code",
             "source": [
-                "public IfrsVariable CreateVariable(IDataRow row, Guid partition)",
-                "\n    => new IfrsVariable(){AocType = row.Field<string>(nameof(IfrsVariable.AocType)),",
+                "public IfrsVariable CreateVariable(IDataRow row, Guid partition) {",
+                "\n    var values = Enumerable.Range(0, numberOfProjections).Select(x => ParseIfrsVariableValue(row, \"Values\" + x.ToString())).ToArray();",
+                "\n    return new IfrsVariable(){AocType = row.Field<string>(nameof(IfrsVariable.AocType)),",
                 "\n                          Partition = partition,",
                 "\n                          Novelty = row.Field<string>(nameof(IfrsVariable.Novelty)),",
                 "\n                          DataNode = row.Field<string>(nameof(IfrsVariable.DataNode)),",
@@ -135,8 +136,9 @@
                 "\n                          AmountType = row.Field<string>(nameof(IfrsVariable.AmountType)),",
                 "\n                          AccidentYear = Int32.TryParse((row.Field<string>(nameof(IfrsVariable.AccidentYear))), out var accidentYear) ? accidentYear : (int?)null,",
                 "\n                          EconomicBasis = row.Field<string>(nameof(IfrsVariable.EconomicBasis)),",
-                "\n                          Values = Enumerable.Range(0, numberOfProjections).Select(x => ParseIfrsVariableValue(row, \"Values\" + x.ToString())).ToArray().Prune()",
-                "\n    };"
+                "\n                          Values = values.Prune().Count() == 0 ? new []{0d} : values.Prune(),",
+                "\n    };",
+                "\n}    "
             ],
             "metadata": {},
             "execution_count": 0,
@@ -328,6 +330,17 @@
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12__F.csv\"   , \"CH\", 2020, 12),",
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12__OA.csv\"  , \"CH\", 2020, 12),",
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12__RA.csv\"  , \"CH\", 2020, 12),",
+                "\n    // 2020 Q4 MTUP10pct",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_BE.csv\"   , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_BEPA.csv\" , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_A.csv\"    , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_APA.csv\"  , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_DA.csv\"   , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_C.csv\"    , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_L.csv\"    , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_LR.csv\"   , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_F.csv\"    , \"CH\", 2020, 12, \"MTUP10pct\"),",
+                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_RA.csv\"   , \"CH\", 2020, 12, \"MTUP10pct\"),",
                 "\n    // 2021 Q1",
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2021_3__A.csv\"    , \"CH\", 2021, 3),",
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2021_3__AA.csv\"   , \"CH\", 2021, 3),",
@@ -341,15 +354,6 @@
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2021_3__LR.csv\"   , \"CH\", 2021, 3),",
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2021_3__OA.csv\"   , \"CH\", 2021, 3),",
                 "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2021_3__RA.csv\"   , \"CH\", 2021, 3),",
-                "\n    // 2020 Q4",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_BE.csv\"   , \"CH\", 2020, 12, \"MTUP10pct\"),",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_BEPA.csv\" , \"CH\", 2020, 12, \"MTUP10pct\"),",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_A.csv\"    , \"CH\", 2020, 12, \"MTUP10pct\"),",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_APA.csv\"  , \"CH\", 2020, 12, \"MTUP10pct\"),",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_DA.csv\"   , \"CH\", 2020, 12, \"MTUP10pct\"),",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_C.csv\"    , \"CH\", 2020, 12, \"MTUP10pct\"),",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_F.csv\"    , \"CH\", 2020, 12, \"MTUP10pct\"),",
-                "\n    new BenchmarkMetadata(pathToBm+\"BM_CH_2020_12_MTUP10pct_RA.csv\"   , \"CH\", 2020, 12, \"MTUP10pct\"),",
                 "\n};"
             ],
             "metadata": {},
diff --git a/ifrs17-template/Test/PracticalCase-CSMSwitchTest.ipynb b/ifrs17-template/Test/PracticalCase-CSMSwitchTest.ipynb
index 9343b377..cf4c8c60 100644
--- a/ifrs17-template/Test/PracticalCase-CSMSwitchTest.ipynb
+++ b/ifrs17-template/Test/PracticalCase-CSMSwitchTest.ipynb
@@ -145,7 +145,7 @@
             "cell_type": "code",
             "source": [
                 "eops.Where(x => x.EstimateType == \"C\").Count().Should().Be(2);",
-                "\neops.Where(x => x.EstimateType == \"C\").All(x => Math.Abs(x.Value - 5.71) < 0.01).Should().BeTrue();",
+                "\neops.Where(x => x.EstimateType == \"C\").All(x => Math.Abs(x.Value - 16.71) < 0.01).Should().BeTrue();",
                 "\neops.Single(x => x.EstimateType == \"L\").Value.Should().BeApproximately(0,Precision);"
             ],
             "metadata": {},
diff --git a/ifrs17-template/Test/ScenarioDataImportTest.ipynb b/ifrs17-template/Test/ScenarioDataImportTest.ipynb
index 2fcc808c..5355df41 100644
--- a/ifrs17-template/Test/ScenarioDataImportTest.ipynb
+++ b/ifrs17-template/Test/ScenarioDataImportTest.ipynb
@@ -112,8 +112,9 @@
                 "\nCH,2020,12,",
                 "\n@@Cashflow",
                 "\nDataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11,Values12,Values13,Values14,Values15,Values16,Values17,Values18,Values19,Values20,Values21,Values22,Values23",
-                "\nDT1.1,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0",
+                "\nDT1.1,PR,BE,CL,C,,200,0,0,200,0,0,200,0,0,200,0,0,0,200,0,0,200,0,0,200,0,0,200,0",
                 "\nDT1.1,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25",
+                "\nDT1.1,DAE,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25",
                 "\nDT1.1,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3",
                 "\nDT1.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5",
                 "\nDTR1.1,PR,BE,CL,C,,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0",
@@ -143,8 +144,7 @@
                 "\nCH,2020,12,",
                 "\n@@Actual",
                 "\nDataNode,AocType,AmountType,EstimateType,AccidentYear,Value",
-                "\nDT1.1,CF,ACA,A,,-10",
-                "\nDT1.1,CF,AEA,A,,-5",
+                "\nDT1.1,CF,DAE,A,,-250",
                 "\nDT1.1,CF,NIC,A,,-280",
                 "\nDT1.1,CF,PR,A,,400",
                 "\nDTR1.1,CF,PR,A,,-200",
@@ -294,7 +294,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "# Update of Deferrable Actuals with a Scenario Coverage Units Import"
+                "# Update of Deferrable with a Scenario Coverage Units Import"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -303,7 +303,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "Update CU cashflow for scenario and check that the Amortization Factor (and hence the Deferrable Actual) is updated"
+                "Update CU cashflow for scenario and check that the Amortization Factor (and hence the Deferrables) is updated"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -363,7 +363,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "# Update of Deferrable Actuals with a Scenario ACA/AEA Import"
+                "# Update of Deferrable with a Scenario DAE Import"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -378,8 +378,7 @@
                 "\nCH,2020,12,MTUP10pct",
                 "\n@@Actual",
                 "\nDataNode,AocType,AmountType,EstimateType,AccidentYear,Value",
-                "\nDT1.1,CF,ACA,A,,-555",
-                "\nDT1.1,CF,AEA,A,,-777\";"
+                "\nDT1.1,CF,DAE,A,,-777\";"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -398,8 +397,8 @@
             "cell_type": "code",
             "source": [
                 "await DataSource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(argsScenario);",
-                "\nvar ivsScenarioActualUpdateACAAEA = await DataSource.Query<IfrsVariable>().ToArrayAsync();",
-                "\nvar diffs = ivsScenarioActualUpdateACAAEA.Except(ivsScenarioCashflowUpdateCU, IfrsVariableComparer.Instance());",
+                "\nvar ivsScenarioActualUpdateDae = await DataSource.Query<IfrsVariable>().ToArrayAsync();",
+                "\nvar diffs = ivsScenarioActualUpdateDae.Except(ivsScenarioCashflowUpdateCU, IfrsVariableComparer.Instance());",
                 "\nvar actualVars = diffs.Where(x => onlyActualEstimateTypes.Contains(x.EstimateType)).ToArray();",
                 "\nvar cashflowVars = diffs.Where(x => onlyCashflowEstimateTypes.Contains(x.EstimateType)).ToArray();",
                 "\nvar actualAndCashflowVars = diffs.Where(x => actualAndCashflowEstimateTypes.Contains(x.EstimateType)).ToArray();"
@@ -423,7 +422,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "# Removal of Deferrable Actuals with a Actual Scenario Import"
+                "# Removal of Deferrable EA with a Actual Scenario Import"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -432,7 +431,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "Set ACA and AEA to zero and check that DA is removed"
+                "Set DAE to zero and check that DA is changed"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -441,14 +440,13 @@
         {
             "cell_type": "code",
             "source": [
-                "var actualsScenarioNoACAAEA = @\"",
+                "var actualsScenarioNoDae = @\"",
                 "\n@@Main",
                 "\nReportingNode,Year,Month,Scenario",
                 "\nCH,2020,12,MTUP10pct",
                 "\n@@Actual",
                 "\nDataNode,AocType,AmountType,EstimateType,AccidentYear,Value",
-                "\nDT1.1,CF,ACA,A,,0",
-                "\nDT1.1,CF,AEA,A,,0\";"
+                "\nDT1.1,CF,DAE,A,,0\";"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -457,7 +455,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromString(actualsScenarioNoACAAEA).WithFormat(ImportFormats.Actual).WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromString(actualsScenarioNoDae).WithFormat(ImportFormats.Actual).WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -467,8 +465,8 @@
             "cell_type": "code",
             "source": [
                 "await DataSource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(argsScenario);",
-                "\nvar ivsScenarioActualNoACAAEA = await DataSource.Query<IfrsVariable>().ToArrayAsync();",
-                "\nvar diffs = ivsScenarioActualNoACAAEA.Except(ivsScenarioActualUpdateACAAEA, IfrsVariableComparer.Instance());"
+                "\nvar ivsScenarioActualNoDaeEA = await DataSource.Query<IfrsVariable>().ToArrayAsync();",
+                "\nvar diffs = ivsScenarioActualNoDaeEA.Except(ivsScenarioActualUpdateDae, IfrsVariableComparer.Instance());"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -478,8 +476,8 @@
             "cell_type": "code",
             "source": [
                 "diffs.Where(x => x.EstimateType == EstimateTypes.DA).ToArray().Length.Should().NotBe(0);",
-                "\nivsScenarioActualNoACAAEA.Where(x => x.EstimateType == EstimateTypes.F).Count().Should().NotBe(0);",
-                "\nivsScenarioActualNoACAAEA.Where(x => x.EstimateType == EstimateTypes.DA && x.Values.Any(v => Math.Abs(v) > Precision)).Count().Should().Be(0);"
+                "\nivsScenarioActualNoDaeEA.Where(x => x.EstimateType == EstimateTypes.F).Count().Should().NotBe(0);",
+                "\nivsScenarioActualNoDaeEA.Where(x => x.EstimateType == EstimateTypes.DA && x.AocType == AocTypes.EA && x.Values.Any(v => Math.Abs(v) > Precision)).Count().Should().Be(0);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -503,8 +501,9 @@
                 "\nCH,2020,12,MTUP10pct",
                 "\n@@Cashflow",
                 "\nDataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11,Values12,Values13,Values14,Values15,Values16,Values17,Values18,Values19,Values20,Values21,Values22,Values23",
-                "\nDT1.1,PR,BE,CL,C,,100,0,0,100,0,0,100,0,0,100,0,0,0,100,0,0,100,0,0,100,0,0,100,0",
+                "\nDT1.1,PR,BE,CL,C,,200,0,0,200,0,0,200,0,0,200,0,0,0,200,0,0,200,0,0,200,0,0,200,0",
                 "\nDT1.1,NIC,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25",
+                "\nDT1.1,DAE,BE,CL,C,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25",
                 "\nDT1.1,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3",
                 "\nDT1.1,,RA,CL,C,,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5\";"
             ],
@@ -521,9 +520,11 @@
                 "\nCH,2020,12,MTUP10pct",
                 "\n@@Actual",
                 "\nDataNode,AocType,AmountType,EstimateType,AccidentYear,Value",
-                "\nDT1.1,CF,ACA,A,,-10",
-                "\nDT1.1,CF,AEA,A,,-5",
-                "\nDT1.1,CF,NIC,A,,-280\";"
+                "\nDT1.1,CF,DAE,A,,-250",
+                "\nDT1.1,CF,NIC,A,,-280",
+                "\nDT1.1,CF,PR,A,,400",
+                "\nDTR1.1,CF,PR,A,,-200",
+                "\nDTR1.1,CF,NIC,A,,140\";"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -596,6 +597,7 @@
                 "\nDataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11,Values12,Values13,Values14,Values15,Values16,Values17,Values18,Values19,Values20,Values21,Values22,Values23",
                 "\nDT1.1,PR,BE,CL,C,,210,0,0,210,0,0,210,0,0,210,0,0,0,210,0,0,210,0,0,210,0,0,210,0",
                 "\nDT1.1,NIC,BE,CL,C,,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37",
+                "\nDT1.1,DAE,BE,CL,C,,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26",
                 "\nDT1.1,CU,P,CL,C,,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-3.3",
                 "\nDT1.1,,RA,CL,C,,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42",
                 "\nDTR1.1,PR,BE,CL,C,,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0,50,0,0",
@@ -683,6 +685,7 @@
                 "\nDT1.1,ICO,BE,CL,C,,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3",
                 "\nDT1.1,PR,BE,CL,C,,210,0,0,210,0,0,210,0,0,210,0,0,0,210,0,0,210,0,0,210,0,0,210,0",
                 "\nDT1.1,NIC,BE,CL,C,,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37,-37",
+                "\nDT1.1,DAE,BE,CL,C,,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26",
                 "\nDT1.1,CU,P,CL,C,,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-21,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-3.3",
                 "\nDT1.1,,RA,CL,C,,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42,-42\";"
             ],
@@ -872,6 +875,7 @@
                 "\nDataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11,Values12,Values13,Values14,Values15,Values16,Values17,Values18,Values19,Values20,Values21,Values22,Values23",
                 "\nDT1.1,PR,BE,CL,C,,200,0,0,200,0,0,200,0,0,200,0,0,0,200,0,0,200,0,0,200,0,0,200,0",
                 "\nDT1.1,NIC,BE,CL,C,,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33,-33",
+                "\nDT1.1,DAE,BE,CL,C,,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26",
                 "\nDT1.1,CU,P,CL,C,,-719,-71,-70,-70,-69,-69,-68,-68,-67,-67,-66,-66,-65,-65,-64,-64,-63,-63,-62,-62,-61,-61,-60,-60",
                 "\nDT1.1,,RA,CL,C,,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45,-45\";"
             ],
diff --git a/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb b/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb
index c0c31c3f..243164fd 100644
--- a/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb
+++ b/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb
@@ -114,8 +114,9 @@
                 "\nYear,Month,Scenario",
                 "\n2020,1,",
                 "\n@@YieldCurve",
-                "\nCurrency,Values0,Values1,Values2,Values3",
-                "\nUSD,0.002,0.002,0.002,0.002\";"
+                "\nCurrency,Values0,Values1,Values2,Values3,Name",
+                "\nUSD,0.002,0.002,0.002,0.002,",
+                "\nEUR,0.002,0.002,0.002,0.002,NoDiscount\";"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -217,10 +218,11 @@
                 "\nYear,Month,Scenario",
                 "\n2020,12,YCUP1.0pct",
                 "\n@@YieldCurve",
-                "\nCurrency,Values0,Values1,Values2,Values3",
-                "\nEUR,0.108,0.108,0.118,0.119",
-                "\nCHF,0.102,0.102,0.102,0.102",
-                "\nUSD,0.102,0.102,0.102,0.102\";"
+                "\nCurrency,Values0,Values1,Values2,Values3,Name",
+                "\nEUR,0.108,0.108,0.118,0.119,",
+                "\nCHF,0.102,0.102,0.102,0.102,",
+                "\nUSD,0.102,0.102,0.102,0.102,",
+                "\nEUR,0.002,0.002,0.002,0.002,3PCT\";"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -381,7 +383,7 @@
                 "\nYear,Month",
                 "\n2020,12",
                 "\n@@YieldCurve",
-                "\nCurrency,Values0,Values1,Values2,Values3",
+                "\nCurrency,Values0,Values1,Values2,Values3,Name",
                 "\nUSD,0.006,0.004,0.004,0.005\";"
             ],
             "metadata": {},
diff --git a/ifrs17/Constants/Consts.ipynb b/ifrs17/Constants/Consts.ipynb
index 5184528f..4925077f 100644
--- a/ifrs17/Constants/Consts.ipynb
+++ b/ifrs17/Constants/Consts.ipynb
@@ -301,7 +301,8 @@
                 "\n    public const string A = nameof(A);       //Actuals",
                 "\n    public const string AA = nameof(AA);     //Advance Actuals",
                 "\n    public const string OA = nameof(OA);     //Overdue Actuals",
-                "\n    public const string DA = nameof(DA);     //Deferrable Actuals",
+                "\n    public const string DA = nameof(DA);     //Deferrable Expenses",
+                "\n    public const string R = nameof(R);       //Premium Revenues",
                 "\n    public const string C = nameof(C);       //Contractual Service Margin",
                 "\n    public const string L = nameof(L);       //Loss Component",
                 "\n    public const string LR = nameof(LR);     //Loss Recovery",
diff --git a/ifrs17/Constants/Validations.ipynb b/ifrs17/Constants/Validations.ipynb
index 5f77b612..49ecd6c5 100644
--- a/ifrs17/Constants/Validations.ipynb
+++ b/ifrs17/Constants/Validations.ipynb
@@ -172,7 +172,7 @@
                 "\n    (Error.CreditDefaultRateNotFound      , 1) => $\"Credit Default Rate not found for rating {s[0]}.\",",
                 "\n    (Error.MissingPremiumAllocation       , 1) => $\"Premium Allocation Rate not found for Group of Contract {s[0]}.\",  // TODO: this is now a warning to be produced by a validation in the importers (default is 1)",
                 "\n    (Error.ReinsuranceCoverage            , 1) => $\"Reinsurance Allocation Rate not found for Group of Insurance Contract {s[0]}.\",",
-                "\n    (Error.YieldCurveNotFound             , 5) => $\"Yield Curve not found for Currency {s[0]}, Year {s[1]}, Month {s[2]}, Scenario {(s[3] == null ? \"Best Estimate\" : s[3])} and Name {s[4]}.\",",
+                "\n    (Error.YieldCurveNotFound             , 6) => $\"Yield Curve not found for DataNode {s[0]}, Currency {s[1]}, Year {s[2]}, Month {s[3]}, Scenario {(s[4] == null ? \"Best Estimate\" : s[4])} and Name {s[5]}.\",",
                 "\n    (Error.YieldCurvePeriodNotApplicable  , 2) => $\"YieldCurve period NotApplicable not valid for AoC Step with AoC Type {s[0]} and Novelty {s[1]}.\",",
                 "\n    (Error.EconomicBasisNotFound          , 1) => $\"EconomicBasis not valid for DataNode {s[0]}.\",",
                 "\n    (Error.AccountingVariableTypeNotFound , 1) => $\"AccountingVariableType {s[0]} not found.\",",
diff --git a/ifrs17/Import/2ImportScope-PresentValue.ipynb b/ifrs17/Import/2ImportScope-PresentValue.ipynb
index 03fb37b1..9a7dd248 100644
--- a/ifrs17/Import/2ImportScope-PresentValue.ipynb
+++ b/ifrs17/Import/2ImportScope-PresentValue.ipynb
@@ -507,6 +507,38 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "In case the Interest Accretion step is computed without using a cash flow like for In Force contribution in Contractual Service Margin and Loss Component computed by the [Technical Margin](4ImportScope-TechnicalMargin#technical-margin). Interest Accretion factor is computed by: ",
+                "\n",
+                "\n$$",
+                "\nIAF = \\prod _{i = S}^{S + TS - 1} \\text{Monthly }IF_i ~,",
+                "\n$$",
+                "\nwhere $\\text{Monthly }IF_i$ is computed through the [Yield Curve](#interest-and-discount-rates-and-factors) using a specified Economic Basis (Current or Locked-in) specified in the scope computation that uses this factor. The current Interest Accretion factor is applied to the aggregated value over the previus AoC Steps to compute the Interest Accreation amount. "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "public interface InterestAccretionFactor : IScope<ImportIdentity, ImportStorage>{",
+                "\n    private int timeStep => GetStorage().GetTimeStep(Identity.ProjectionPeriod);",
+                "\n    private int shift => GetStorage().GetShift(Identity.ProjectionPeriod);",
+                "\n    ",
+                "\n    double GetInterestAccretionFactor(string economicBasis) ",
+                "\n    {",
+                "\n        double[] monthlyInterestFactor = GetScope<MonthlyRate>(Identity, o => o.WithContext(economicBasis)).Interest;",
+                "\n        return Enumerable.Range(shift,timeStep).Select(i => monthlyInterestFactor.GetValidElement(i/12)).Aggregate(1d, (x, y) => x * y ) - 1d;",
+                "\n    }",
+                "\n}"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "markdown",
             "source": [
diff --git a/ifrs17/Import/3ImportScope-Actuals.ipynb b/ifrs17/Import/3ImportScope-Actuals.ipynb
index a687acde..4fa77ba2 100644
--- a/ifrs17/Import/3ImportScope-Actuals.ipynb
+++ b/ifrs17/Import/3ImportScope-Actuals.ipynb
@@ -77,11 +77,10 @@
             "source": [
                 "# Actual Values",
                 "\n",
-                "\nWe consider 4 types of Actual values, which are distinguished through their [Estimate Type](../DataModel/DataStructure#estimate-type):",
+                "\nWe consider 3 types of Actual values, which are distinguished through their [Estimate Type](../DataModel/DataStructure#estimate-type):",
                 "\n- [Actuals](#actuals) (A)",
                 "\n- [Advance Actuals](#advance-actuals) (AA)",
                 "\n- [Overdue Actuals](#overdue-actuals) (OA)",
-                "\n- [Deferrable Actuals](#deferrable-actuals) (DA)",
                 "\n",
                 "\nwith the Estimate Type's system name shown between parenthesis above.",
                 "\n",
@@ -121,8 +120,7 @@
         {
             "cell_type": "code",
             "source": [
-                "public interface ActualBase : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? AccidentYear), ImportStorage>",
-                "\n{",
+                "public interface ActualBase : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? AccidentYear), ImportStorage>{",
                 "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
                 "\n            builder.ForScope<ActualBase>(s => s.WithApplicability<EmptyValuesActual>(x => x.GetStorage().ImportFormat == ImportFormats.Actual && !x.GetStorage().IsSecondaryScope(x.Identity.Id.DataNode) && x.Identity.Id.AocType == AocTypes.AM)",
                 "\n                                               .WithApplicability<EndOfPeriodActual>(x => x.GetStorage().ImportFormat != ImportFormats.Cashflow && !x.GetStorage().IsSecondaryScope(x.Identity.Id.DataNode) && x.Identity.Id.AocType == AocTypes.EOP && x.Identity.EstimateType != EstimateTypes.A)",
@@ -131,14 +129,12 @@
                 "\n    public double Value => GetStorage().GetValue(Identity.Id, Identity.AmountType, Identity.EstimateType, Identity.AccidentYear, Identity.Id.ProjectionPeriod); ",
                 "\n}",
                 "\n",
-                "\npublic interface EndOfPeriodActual : ActualBase",
-                "\n{",
-                "\n    double ActualBase.Value => GetScope<PreviousAocSteps>((Identity.Id, InputSource.Actual)).Values",
-                "\n                                        .Sum(aocStep => GetScope<ActualBase>((Identity.Id with {AocType = aocStep.AocType, Novelty = aocStep.Novelty}, Identity.AmountType, Identity.EstimateType, Identity.AccidentYear)).Value);",
+                "\npublic interface EndOfPeriodActual : ActualBase{",
+                "\n    double ActualBase.Value => GetScope<PreviousAocSteps>((Identity.Id, InputSource.Actual)).Values.Sum(aocStep => ",
+                "\n        GetScope<ActualBase>((Identity.Id with {AocType = aocStep.AocType, Novelty = aocStep.Novelty}, Identity.AmountType, Identity.EstimateType, Identity.AccidentYear)).Value);",
                 "\n}",
                 "\n",
-                "\npublic interface EmptyValuesActual : ActualBase",
-                "\n{",
+                "\npublic interface EmptyValuesActual : ActualBase{",
                 "\n    double ActualBase.Value => 0;",
                 "\n}",
                 "\n",
@@ -179,8 +175,7 @@
         {
             "cell_type": "code",
             "source": [
-                "public interface Actual : IScope<ImportIdentity, ImportStorage>",
-                "\n{",
+                "public interface Actual : IScope<ImportIdentity, ImportStorage>{",
                 "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
                 "\n    string EstimateType => EstimateTypes.A;",
                 "\n    ",
@@ -228,9 +223,8 @@
                 "\n    private int?[] accidentYears => GetStorage().GetAccidentYears(Identity.DataNode, Identity.ProjectionPeriod).ToArray();",
                 "\n    ",
                 "\n    [NotVisible]",
-                "\n    ActualBase[] Actuals => GetScope<ValidAmountType>(Identity.DataNode).ActualAmountTypes",
-                "\n                                                            .SelectMany(at => accidentYears",
-                "\n                                                                .Select(ay => GetScope<ActualBase>((Identity, at, EstimateType, ay)))).ToArray();",
+                "\n    ActualBase[] Actuals => GetScope<ValidAmountType>(Identity.DataNode).ActualAmountTypes.SelectMany(at => ",
+                "\n                                accidentYears.Select(ay => GetScope<ActualBase>((Identity, at, EstimateType, ay)))).ToArray();",
                 "\n}"
             ],
             "metadata": {},
@@ -270,9 +264,8 @@
                 "\n    private int?[] accidentYears => GetStorage().GetAccidentYears(Identity.DataNode, Identity.ProjectionPeriod).ToArray();",
                 "\n    ",
                 "\n    [NotVisible]",
-                "\n    ActualBase[] Actuals => GetScope<ValidAmountType>(Identity.DataNode).ActualAmountTypes",
-                "\n                                                            .SelectMany(at => accidentYears",
-                "\n                                                                .Select(ay => GetScope<ActualBase>((Identity, at, EstimateType, ay)))).ToArray();",
+                "\n    ActualBase[] Actuals => GetScope<ValidAmountType>(Identity.DataNode).ActualAmountTypes.SelectMany(at => ",
+                "\n                                accidentYears.Select(ay => GetScope<ActualBase>((Identity, at, EstimateType, ay)))).ToArray();",
                 "\n}"
             ],
             "metadata": {},
@@ -282,7 +275,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "## Deferrable Actuals"
+                "# Deferrable"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -291,20 +284,11 @@
         {
             "cell_type": "markdown",
             "source": [
-                "Finally, Deferrable Actuals are given by",
-                "\n",
-                "\n$$",
-                "\n\\text{Deferrable Actual} (\\text{AoC step}) = \\left\\{",
-                "\n\\begin{array}{rl}",
-                "\n\\sum_{\\text{Amount Type}~\\in~\\text{\\{ACA, AEA}\\}}\\text{Actual Base}(\\rm{CF})|_{\\text{Estimate Type = A}} ~, & \\text{if AoC Step's AoC Type = CF } \\\\",
-                "\n- \\text{Amortization Factor} \\cdot \\big(  \\text{Deferrable Actual}(\\rm{BOP}) + \\text{Deferrable Actual}(\\rm{CF}) \\big) ~, & \\text{if AoC Step's AoC Type = AM } \\\\",
-                "\n\\text{Deferrable Actual}(\\rm{BOP}) + \\text{Deferrable Actual}(\\rm{CF}) + \\text{Deferrable Actual}(\\rm{AM}) ~, & \\text{if AoC Step's AoC Type = EOP } \\\\",
-                "\n\\text{Input Actual}|_{\\text{Estimate Type = DA}} ~, & \\text{ otherwise } \\\\",
-                "\n\\end{array}",
-                "\n\\right.",
-                "\n$$",
+                "Deferral variables are computed here using cashflow inputs. We distinguish between two approaches depending on the EconomicBasisDriver defined in the [DataNodeParameter](../DataModel/DataStructure#data-node-parameters):",
+                "\n- L (Locked-in) or C (Current) : discounting is applied (cf. [Deferrable as cumulated discounted cash flow](#deferrable-as-cumulated-discounted-cash-flow)),",
+                "\n- N (Nominal) : discounting is not applied (cf. [Deferrable undiscounted](#deferrable-undiscounted)).",
                 "\n",
-                "\nwhere $ACA$ and $AEA$ are *Aquisition* Amount Types from **Attributable Commission** and **Attributable Expenses**, respectively."
+                "\n"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -328,72 +312,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "public interface DeferrableActual : IScope<ImportIdentity, ImportStorage>",
-                "\n{",
-                "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
-                "\n            builder.ForScope<DeferrableActual>(s => s.WithApplicability<DeferrableActualForCurrentBasis>(x => x.Identity.ValuationApproach == ValuationApproaches.VFA, ",
-                "\n                                                                                                              p => p.ForMember(s => s.EconomicBasis))",
-                "\n                                                     .WithApplicability<ReleaseDeferrable>(x => x.Identity.AocType == AocTypes.CF)",
-                "\n                                                     .WithApplicability<AmortizationDeferrable>(x => x.Identity.AocType == AocTypes.AM)",
-                "\n                                                     .WithApplicability<EndOfPeriodDeferrable>(x => x.Identity.AocType == AocTypes.EOP)",
-                "\n                                       );",
-                "\n    ",
-                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
-                "\n    string EstimateType => EstimateTypes.DA;",
-                "\n    [NotVisible] string EconomicBasis => EconomicBases.L;",
-                "\n    ",
-                "\n    public double Value => GetStorage().GetValue(Identity, (string)null, EstimateType, (int?)null, Identity.ProjectionPeriod);",
-                "\n}",
-                "\n",
-                "\npublic interface DeferrableActualForCurrentBasis : DeferrableActual{",
-                "\n    [NotVisible] string DeferrableActual.EconomicBasis => EconomicBases.C;",
-                "\n}",
-                "\n",
-                "\npublic interface ReleaseDeferrable : DeferrableActual{",
-                "\n    double DeferrableActual.Value => GetStorage().GetAttributableExpenseAndCommissionAmountType().Sum(at => GetScope<ActualBase>((Identity, at, EstimateTypes.A, (int?)null)).Value);",
-                "\n}",
-                "\n",
-                "\npublic interface AmortizationDeferrable : DeferrableActual{",
-                "\n    private double AmortizationFactor => GetScope<DiscountedAmortizationFactorForDeferrals>(Identity, o => o.WithContext(EconomicBasis)).Value;",
-                "\n    private double AggregatedDeferrable => GetScope<PreviousAocSteps>((Identity, InputSource.Actual)).Values",
-                "\n                                            .Sum(aocStep => GetScope<DeferrableActual>(Identity with {AocType = aocStep.AocType, Novelty = aocStep.Novelty}).Value);",
-                "\n    double DeferrableActual.Value => Math.Abs(AggregatedDeferrable) > Precision ? -1d * AggregatedDeferrable * AmortizationFactor : default;",
-                "\n}",
-                "\n",
-                "\npublic interface EndOfPeriodDeferrable : DeferrableActual{",
-                "\n    double DeferrableActual.Value => GetScope<PreviousAocSteps>((Identity, InputSource.Actual)).Values",
-                "\n                                        .Sum(aocStep => GetScope<DeferrableActual>(Identity with {AocType = aocStep.AocType, Novelty = aocStep.Novelty}).Value);",
-                "\n}"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "markdown",
-            "source": [
-                "# Deferrable"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "markdown",
-            "source": [
-                "Deferral variables are computed here using cashflow inputs. We distinguish between two approaches depending on the EconomicBasisDriver defined in the [DataNodeParameter](../DataModel/DataStructure#data-node-parameters):",
-                "\n- L (Locked-in) or C (Current) : discounting is applied (cf. [Deferrable as cumulated discounted cash flow](#deferrable-as-cumulated-discounted-cash-flow)),",
-                "\n- N (Nominal) : discounting is not applied (cf. [Deferrable undiscounted](#deferrable-undiscounted)).",
-                "\n",
-                "\n"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "markdown",
             "source": [
@@ -424,30 +342,40 @@
                 "public interface DiscountedDeferrable : IScope<ImportIdentity, ImportStorage>",
                 "\n{",
                 "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
-                "\n        builder.ForScope<DiscountedDeferrable>(s => s //compute with IfrsVariable?",
-                "\n                                                 .WithApplicability<DeferrableForBopProjection>(x => x.Identity.AocType == AocTypes.BOP && x.Identity.Novelty == Novelties.I && x.Identity.ProjectionPeriod > 0)",
-                "\n                                                 .WithApplicability<DeferrableForBop>(x => x.Identity.AocType == AocTypes.BOP && x.Identity.Novelty == Novelties.I)",
-                "\n                                                 .WithApplicability<DeferrableDefaultValue>(x => x.Identity.AocType == AocTypes.CF)",
-                "\n                                                 .WithApplicability<DeferrableEa>(x => x.Identity.AocType == AocTypes.EA)",
-                "\n                                                 .WithApplicability<DeferrableAm>(x => x.Identity.AocType == AocTypes.AM)",
-                "\n                                                 .WithApplicability<DeferrableEop>(x => x.Identity.AocType == AocTypes.EOP)",
-                "\n                                   );",
-                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
-                "\n    string EstimateType => EstimateTypes.DA;",
-                "\n    string AmountType => null;",
-                "\n",
-                "\n    [NotVisible] string EconomicBasis => GetStorage().GetEconomicBasisDriver(Identity.DataNode);",
+                "\n        builder.ForScope<DiscountedDeferrable>(s => s",
+                "\n            .WithApplicability<DeferrableWithIfrsVariable>(x => x.GetStorage().IsSecondaryScope(x.Identity.DataNode))",
+                "\n            .WithApplicability<DeferrableForBopProjection>(x => x.Identity.AocType == AocTypes.BOP && x.Identity.Novelty == Novelties.I && x.Identity.ProjectionPeriod > 0)",
+                "\n            .WithApplicability<DeferrableForBop>(x => x.Identity.AocType == AocTypes.BOP && x.Identity.Novelty == Novelties.I)",
+                "\n            .WithApplicability<DeferrableForIa>(x => x.Identity.AocType == AocTypes.IA && x.Identity.Novelty == Novelties.I)",
+                "\n            .WithApplicability<DeferrableDefaultValue>(x => x.Identity.AocType == AocTypes.CF)",
+                "\n            .WithApplicability<DeferrableEa>(x => x.Identity.AocType == AocTypes.EA)",
+                "\n            .WithApplicability<DeferrableAm>(x => x.Identity.AocType == AocTypes.AM)",
+                "\n            .WithApplicability<DeferrableEop>(x => x.Identity.AocType == AocTypes.EOP)",
+                "\n        );",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))] string EstimateType => EstimateTypes.DA;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(AmountType))] string AmountType => null;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))] string EconomicBasis => GetStorage().GetEconomicBasisDriver(Identity.DataNode);",
                 "\n    ",
                 "\n    double Value => GetStorage().GetDeferrableExpenses().Sum(at => ",
                 "\n        GetScope<PresentValue>((Identity, at, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value);",
                 "\n}",
                 "\n",
+                "\npublic interface DeferrableWithIfrsVariable : DiscountedDeferrable {",
+                "\n    double DiscountedDeferrable.Value => GetStorage().GetValue(Identity, AmountType, EstimateType, EconomicBasis, (int?)null, Identity.ProjectionPeriod);",
+                "\n}",
+                "\n",
                 "\npublic interface DeferrableForBopProjection : DiscountedDeferrable {",
-                "\n    double DiscountedDeferrable.Value => GetScope<DiscountedDeferrable>(Identity with {AocType = AocTypes.EOP, Novelty = Novelties.C, ProjectionPeriod = Identity.ProjectionPeriod - 1}).Value;  ",
+                "\n    double DiscountedDeferrable.Value => GetScope<DiscountedDeferrable>(Identity with {AocType = AocTypes.EOP, Novelty = Novelties.C, ProjectionPeriod = Identity.ProjectionPeriod - 1}).Value;",
                 "\n}",
                 "\n",
                 "\npublic interface DeferrableForBop : DiscountedDeferrable {",
-                "\n    double DiscountedDeferrable.Value => GetStorage().GetValue(Identity, null, EstimateTypes.DA, EconomicBasis, (int?)null, Identity.ProjectionPeriod);",
+                "\n    double DiscountedDeferrable.Value => GetStorage().GetValue(Identity, null, EstimateTypes.DA, (int?)null, Identity.ProjectionPeriod);",
+                "\n}",
+                "\n",
+                "\npublic interface DeferrableForIa : DiscountedDeferrable, InterestAccretionFactor {",
+                "\n    private double aggregatedValue => GetScope<PreviousAocSteps>((Identity, InputSource.Cashflow)).Values",
+                "\n        .Sum(aoc => GetScope<DiscountedDeferrable>(Identity with {AocType = aoc.AocType, Novelty = aoc.Novelty}).Value);   ",
+                "\n    double DiscountedDeferrable.Value => aggregatedValue * GetInterestAccretionFactor(EconomicBasis);",
                 "\n}",
                 "\n",
                 "\npublic interface DeferrableDefaultValue : DiscountedDeferrable {",
@@ -522,57 +450,53 @@
                 "\n{",
                 "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
                 "\n            builder.ForScope<NominalDeferrable>(s => s",
-                "\n                                                     .WithApplicability<BoPDeferrableProjection>(x => x.Identity.Id.AocType == AocTypes.BOP && x.Identity.Id.Novelty == Novelties.I && x.Identity.Id.ProjectionPeriod > 0)",
-                "\n                                                     .WithApplicability<BoPDeferrable>(x => x.Identity.Id.AocType == AocTypes.BOP)",
-                "\n                                                     .WithApplicability<ClDeferrable>(x => x.Identity.Id.AocType == AocTypes.CL)",
-                "\n                                                     .WithApplicability<AmDeferrable>(x => x.Identity.Id.AocType == AocTypes.AM)",
-                "\n                                                     .WithApplicability<EopDeferrable>(x => x.Identity.Id.AocType == AocTypes.EOP)",
-                "\n                                       );",
+                "\n                .WithApplicability<NominalDeferrableWithIfrsVariable>(x => x.GetStorage().ImportFormat != ImportFormats.Cashflow || x.GetStorage().IsSecondaryScope(x.Identity.Id.DataNode))",
+                "\n                .WithApplicability<BoPDeferrableProjection>(x => x.Identity.Id.AocType == AocTypes.BOP && x.Identity.Id.Novelty == Novelties.I && x.Identity.Id.ProjectionPeriod > 0)",
+                "\n                .WithApplicability<BoPDeferrable>(x => x.Identity.Id.AocType == AocTypes.BOP)",
+                "\n                .WithApplicability<AmDeferrable>(x => x.Identity.Id.AocType == AocTypes.AM)",
+                "\n                .WithApplicability<EopDeferrable>(x => x.Identity.Id.AocType == AocTypes.EOP)",
+                "\n            );",
                 "\n    ",
-                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
-                "\n    string EstimateType => EstimateTypes.DA;",
-                "\n    string AmountType => null;",
-                "\n    ",
-                "\n    [NotVisible] string EconomicBasis => EconomicBases.N;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))] string EstimateType => EstimateTypes.DA;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(AmountType))] string AmountType => null;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))] string EconomicBasis => EconomicBases.N;",
                 "\n    double Value => default;",
                 "\n}",
                 "\n",
+                "\npublic interface NominalDeferrableWithIfrsVariable : NominalDeferrable {",
+                "\n    double NominalDeferrable.Value => GetStorage().GetValue(Identity.Id, AmountType, EstimateType, EconomicBasis, Identity.MonthlyShift, Identity.Id.ProjectionPeriod);",
+                "\n}",
+                "\n",
                 "\npublic interface BoPDeferrableProjection : NominalDeferrable{",
-                "\n    double NominalDeferrable.Value => GetScope<NominalDeferrable>((",
-                "\n        Identity.Id with {AocType = AocTypes.EOP, Novelty = Novelties.C, ProjectionPeriod = Identity.Id.ProjectionPeriod - 1}, ",
-                "\n        Identity.MonthlyShift)).Value;",
+                "\n    double NominalDeferrable.Value => GetScope<NominalDeferrable>((Identity.Id with {AocType = AocTypes.EOP, Novelty = Novelties.C, ProjectionPeriod = Identity.Id.ProjectionPeriod - 1}, Identity.MonthlyShift)).Value;",
                 "\n}",
                 "\n",
                 "\npublic interface BoPDeferrable : NominalDeferrable{",
                 "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
-                "\n            builder.ForScope<NominalDeferrable>(s => s.WithApplicability<NominalDeferrableFromIfrsVariable>(x =>  x.GetStorage().ImportFormat != ImportFormats.Cashflow",
-                "\n                                                                                                 || x.GetStorage().IsSecondaryScope(x.Identity.Id.DataNode)",
-                "\n                                                                                                 || (x.Identity.Id.Novelty == Novelties.I && !x.GetStorage().IsInceptionYear(x.Identity.Id.DataNode)) ));",
+                "\n            builder.ForScope<NominalDeferrable>(s => s.WithApplicability<NominalDeferrableFromIfrsVariable>(x => x.Identity.Id.Novelty == Novelties.I));",
                 "\n    private int projectionShift => GetStorage().GetShift(Identity.Id.ProjectionPeriod);",
-                "\n    double NominalDeferrable.Value => GetScope<NominalCashflow>((Identity.Id, AmountTypes.DAE, EstimateTypes.BE, (int?)null)).Values",
+                "\n    double NominalDeferrable.Value => GetScope<NominalCashflow>((Identity.Id, AmountTypes.DAE, EstimateTypes.BE, (int?)null)).Values //loop over AM under DE",
                 "\n        .Skip(projectionShift + Identity.MonthlyShift).FirstOrDefault();",
                 "\n}",
                 "\n",
                 "\npublic interface NominalDeferrableFromIfrsVariable : NominalDeferrable{",
-                "\n    double NominalDeferrable.Value => GetStorage().GetValue(Identity.Id, null, EstimateTypes.DA, EconomicBasis, Identity.MonthlyShift, Identity.Id.ProjectionPeriod);",
+                "\n    double NominalDeferrable.Value => GetStorage().GetValue(Identity.Id, AmountType, EstimateTypes.DA, EconomicBasis, Identity.MonthlyShift, Identity.Id.ProjectionPeriod);",
                 "\n}",
                 "\n",
-                "\npublic interface ClDeferrable : NominalDeferrable{",
+                "\npublic interface AmReferenceDeferrable: IScope<(ImportIdentity Id, int MonthlyShift), ImportStorage>{",
                 "\n    private int projectionShift => GetStorage().GetShift(Identity.Id.ProjectionPeriod);",
                 "\n    private IEnumerable<AocStep> previousAocSteps => GetScope<PreviousAocSteps>((Identity.Id, InputSource.Cashflow)).Values.Where(aocStep => aocStep.Novelty != Novelties.C);",
                 "\n    double referenceCashflow => previousAocSteps",
                 "\n        .GroupBy(x => x.Novelty, (k, aocs) => aocs.Last())",
                 "\n        .Sum(aoc => GetScope<NominalCashflow>((Identity.Id with {AocType = aoc.AocType, Novelty = aoc.Novelty}, AmountTypes.DAE, EstimateTypes.BE, (int?)null)).Values",
                 "\n        .Skip(projectionShift + Identity.MonthlyShift).FirstOrDefault());",
-                "\n     ",
-                "\n    double NominalDeferrable.Value => referenceCashflow >= Precision //if no previous RawVariable, use IfrsVariable",
-                "\n        ? referenceCashflow ",
-                "\n        : GetStorage().GetNovelties(AocTypes.BOP, InputSource.Cashflow).Sum(n => GetScope<NominalDeferrable>((Identity.Id with {AocType = AocTypes.BOP, Novelty = n}, Identity.MonthlyShift)).Value);",
+                "\n    //if no previous RawVariable, use IfrsVariable",
+                "\n    double Value => Math.Abs(referenceCashflow) >= Precision ? referenceCashflow : GetStorage().GetNovelties(AocTypes.BOP, InputSource.Cashflow).Sum(n => GetScope<NominalDeferrable>((Identity.Id with {AocType = AocTypes.BOP, Novelty = n}, Identity.MonthlyShift)).Value);",
                 "\n}",
                 "\n",
                 "\npublic interface AmDeferrable : NominalDeferrable{",
                 "\n    private IEnumerable<AocStep> referenceAocSteps => GetScope<ReferenceAocStep>(Identity.Id).Values; //Reference step of AM,C is CL,C",
-                "\n    private double referenceCashflow => referenceAocSteps.Sum(refAocStep => GetScope<NominalDeferrable>((Identity.Id with {AocType = refAocStep.AocType, Novelty = refAocStep.Novelty}, Identity.MonthlyShift)).Value);",
+                "\n    private double referenceCashflow => referenceAocSteps.Sum(refAocStep => GetScope<AmReferenceDeferrable>((Identity.Id with {AocType = refAocStep.AocType, Novelty = refAocStep.Novelty}, Identity.MonthlyShift)).Value);",
                 "\n",
                 "\n    double NominalDeferrable.Value => Math.Abs(referenceCashflow) > Precision ? -1d * referenceCashflow * GetScope<CurrentPeriodAmortizationFactor>((Identity.Id, AmountTypes.DAE, Identity.MonthlyShift), o => o.WithContext(EconomicBasis)).Value : default;",
                 "\n}",
@@ -586,6 +510,97 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Premium Revenue"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "public interface DiscountedAmortizationFactorForRevenues : IScope<ImportIdentity, ImportStorage>",
+                "\n{",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))] private string EconomicBasis => GetContext();",
+                "\n    double Value => GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.PR, 0), o => o.WithContext(EconomicBasis)).EffectiveAmountType == AmountTypes.PR",
+                "\n        ? GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.PR, 0), o => o.WithContext(EconomicBasis)).Value",
+                "\n        : GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.CU, 0), o => o.WithContext(EconomicBasis)).Value;",
+                "\n    string EffectiveAmountType => GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.PR, 0), o => o.WithContext(EconomicBasis)).EffectiveAmountType == AmountTypes.PR",
+                "\n        ? AmountTypes.PR",
+                "\n        : GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.CU, 0), o => o.WithContext(EconomicBasis)).EffectiveAmountType;",
+                "\n}"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "//only PAA LRC",
+                "\npublic interface PremiumRevenue : IScope<ImportIdentity, ImportStorage>{",
+                "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
+                "\n        builder.ForScope<PremiumRevenue>(s => s",
+                "\n            .WithApplicability<PremiumRevenueWithIfrsVariable>(x => x.GetStorage().ImportFormat != ImportFormats.Cashflow || x.GetStorage().IsSecondaryScope(x.Identity.DataNode))",
+                "\n            .WithApplicability<PremiumRevenueForBopProjection>(x => x.Identity.AocType == AocTypes.BOP && x.Identity.Novelty == Novelties.I && x.Identity.ProjectionPeriod > 0)",
+                "\n            .WithApplicability<PremiumRevenueForBop>(x => x.Identity.AocType == AocTypes.BOP && x.Identity.Novelty == Novelties.I)",
+                "\n            .WithApplicability<PremiumRevenueForIa>(x => x.Identity.AocType == AocTypes.IA && x.Identity.Novelty == Novelties.I)",
+                "\n            .WithApplicability<PremiumRevenueDefaultValue>(x => new []{AocTypes.CF, AocTypes.EA}.Contains(x.Identity.AocType))",
+                "\n            //TODO compute EA but in the case of no LC EA is 0",
+                "\n            .WithApplicability<PremiumRevenueAm>(x => x.Identity.AocType == AocTypes.AM)",
+                "\n            .WithApplicability<PremiumRevenueEop>(x => x.Identity.AocType == AocTypes.EOP)",
+                "\n        );",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))] string EstimateType => EstimateTypes.R;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(AmountType))] string AmountType => null;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))] string EconomicBasis => GetStorage().GetEconomicBasisDriver(Identity.DataNode); //TODO or apply C for VFA and L for BBA?",
+                "\n    ",
+                "\n    double Value => GetStorage().GetPremiums().Sum(at => ",
+                "\n        GetScope<PresentValue>((Identity, at, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value);",
+                "\n}",
+                "\n",
+                "\npublic interface PremiumRevenueWithIfrsVariable : PremiumRevenue {",
+                "\n    double PremiumRevenue.Value => GetStorage().GetValue(Identity, AmountType, EstimateType, EconomicBasis, (int?)null, Identity.ProjectionPeriod);",
+                "\n}",
+                "\n",
+                "\npublic interface PremiumRevenueForBopProjection : PremiumRevenue {",
+                "\n    double PremiumRevenue.Value => GetScope<PremiumRevenue>(Identity with {AocType = AocTypes.EOP, Novelty = Novelties.C, ProjectionPeriod = Identity.ProjectionPeriod - 1}).Value;  ",
+                "\n}",
+                "\n",
+                "\npublic interface PremiumRevenueForBop : PremiumRevenue {",
+                "\n    double PremiumRevenue.Value => GetStorage().GetValue(Identity, AmountType, EstimateTypes.R, EconomicBasis, (int?)null, Identity.ProjectionPeriod);",
+                "\n}",
+                "\n",
+                "\npublic interface AggregatedPremiumRevenue : PremiumRevenue {",
+                "\n    double AggregatedValue => GetScope<PreviousAocSteps>((Identity, InputSource.Cashflow)).Values",
+                "\n        .Sum(aoc => GetScope<PremiumRevenue>(Identity with {AocType = aoc.AocType, Novelty = aoc.Novelty}).Value);",
+                "\n}",
+                "\n",
+                "\npublic interface PremiumRevenueForIa : PremiumRevenue, InterestAccretionFactor {",
+                "\n    private double aggregatedValue => GetScope<AggregatedPremiumRevenue>(Identity).AggregatedValue;   ",
+                "\n    double PremiumRevenue.Value => aggregatedValue * GetInterestAccretionFactor(EconomicBasis);",
+                "\n}",
+                "\n",
+                "\npublic interface PremiumRevenueDefaultValue : PremiumRevenue {",
+                "\n    double PremiumRevenue.Value => default;",
+                "\n}",
+                "\n",
+                "\npublic interface PremiumRevenueAm : PremiumRevenue {",
+                "\n    private double AmortizationFactor => GetScope<DiscountedAmortizationFactorForRevenues>(Identity, o => o.WithContext(EconomicBasis)).Value;",
+                "\n    private double aggregatedValue => GetScope<AggregatedPremiumRevenue>(Identity).AggregatedValue;",
+                "\n    double PremiumRevenue.Value => Math.Abs(aggregatedValue) > Precision ? -1d * aggregatedValue * AmortizationFactor : default;",
+                "\n}",
+                "\n",
+                "\npublic interface PremiumRevenueEop : PremiumRevenue {",
+                "\n    double PremiumRevenue.Value => GetScope<AggregatedPremiumRevenue>(Identity).AggregatedValue;",
+                "\n}"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
diff --git a/ifrs17/Import/4ImportScope-TechnicalMargin.ipynb b/ifrs17/Import/4ImportScope-TechnicalMargin.ipynb
index 34f9f1a4..178bdfa7 100644
--- a/ifrs17/Import/4ImportScope-TechnicalMargin.ipynb
+++ b/ifrs17/Import/4ImportScope-TechnicalMargin.ipynb
@@ -75,15 +75,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "markdown",
-            "source": [
-                ""
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "markdown",
             "source": [
@@ -118,20 +109,26 @@
                 "public interface BeExperienceAdjustmentForPremium : IScope<ImportIdentity, ImportStorage>",
                 "\n{",
                 "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
-                "\n            builder.ForScope<BeExperienceAdjustmentForPremium>(s => s",
-                "\n                .WithApplicability<DefaultValueBeExperienceAdjustmentForPremium>(x => x.Identity.AocType != AocTypes.CF));",
+                "\n        builder.ForScope<BeExperienceAdjustmentForPremium>(s => s",
+                "\n            .WithApplicability<DefaultValueBeExperienceAdjustmentForPremium>(x => x.Identity.AocType != AocTypes.CF)",
+                "\n            .WithApplicability<DefaultValueBeExperienceAdjustmentForPremium>(x => x.Identity.ValuationApproach == ValuationApproaches.PAA && x.Identity.Novelty != Novelties.C)",
+                "\n            .WithApplicability<BeExperienceAdjustmentForPremiumForPaa>(x => x.Identity.ValuationApproach == ValuationApproaches.PAA)",
+                "\n            );",
+                "\n",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))] string EstimateType => ComputationHelper.ExperienceAdjustEstimateTypeMapping[EstimateTypes.BE];",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))] string EconomicBasis => GetContext();",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(AmountType))] string AmountType => AmountTypes.PR;",
+                "\n",
+                "\n    double Value => GetStorage().GetPremiumAllocationFactor(Identity) * ",
+                "\n        GetStorage().GetPremiums().Sum(pr => GetScope<PresentValue>((Identity, pr, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value);",
+                "\n}",
                 "\n",
-                "\n    string EstimateType => EstimateTypes.BEPA;",
-                "\n    string EconomicBasis => EconomicBases.L;",
-                "\n    ",
-                "\n    PresentValue[] ByAmountType => GetStorage().GetPremiums().Select(pr => ",
-                "\n                                       Multiply( GetStorage().GetPremiumAllocationFactor(Identity), ",
-                "\n                                                 GetScope<PresentValue>((Identity, pr, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)) ) ).ToArray();                            ",
+                "\npublic interface DefaultValueBeExperienceAdjustmentForPremium : BeExperienceAdjustmentForPremium{",
+                "\n    double BeExperienceAdjustmentForPremium.Value => default;",
                 "\n}",
                 "\n",
-                "\npublic interface DefaultValueBeExperienceAdjustmentForPremium : BeExperienceAdjustmentForPremium",
-                "\n{",
-                "\n    PresentValue[] BeExperienceAdjustmentForPremium.ByAmountType => Enumerable.Empty<PresentValue>().ToArray();",
+                "\npublic interface BeExperienceAdjustmentForPremiumForPaa : BeExperienceAdjustmentForPremium {",
+                "\n    double BeExperienceAdjustmentForPremium.Value => GetScope<PremiumRevenue>(Identity with {AocType = AocTypes.AM, Novelty = Novelties.C}).Value;",
                 "\n}"
             ],
             "metadata": {},
@@ -144,17 +141,24 @@
                 "public interface ActualExperienceAdjustmentOnPremium : IScope<ImportIdentity, ImportStorage>",
                 "\n{",
                 "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
-                "\n            builder.ForScope<ActualExperienceAdjustmentOnPremium>(s => s",
-                "\n                .WithApplicability<DefaultValueActualExperienceAdjustmentOnPremium>(x => x.Identity.AocType != AocTypes.CF));",
+                "\n        builder.ForScope<ActualExperienceAdjustmentOnPremium>(s => s",
+                "\n            .WithApplicability<DefaultValueActualExperienceAdjustmentOnPremium>(x => x.Identity.AocType != AocTypes.CF)",
+                "\n            .WithApplicability<DefaultValueActualExperienceAdjustmentOnPremium>(x => x.Identity.ValuationApproach == ValuationApproaches.PAA && x.Identity.Novelty != Novelties.C)",
+                "\n            .WithApplicability<ActualExperienceAdjustmentOnPremiumForPaa>(x => x.Identity.ValuationApproach == ValuationApproaches.PAA));",
                 "\n    ",
-                "\n    ActualBase[] ByAmountTypeAndEstimateType => GetStorage().GetPremiums().Select(pr =>",
-                "\n                                        Multiply( GetStorage().GetPremiumAllocationFactor(Identity),",
-                "\n                                                GetScope<ActualBase>((Identity, pr, EstimateTypes.A, (int?)null))) ).ToArray();",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(AmountType))] string AmountType => AmountTypes.PR;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))] string EstimateType => ComputationHelper.ExperienceAdjustEstimateTypeMapping[EstimateTypes.A];",
+                "\n    ",
+                "\n    double Value => GetStorage().GetPremiumAllocationFactor(Identity) * ",
+                "\n        GetStorage().GetPremiums().Sum(pr => GetScope<ActualBase>((Identity, pr, EstimateTypes.A, (int?)null)).Value);",
                 "\n}",
                 "\n",
-                "\npublic interface DefaultValueActualExperienceAdjustmentOnPremium : ActualExperienceAdjustmentOnPremium",
-                "\n{",
-                "\n    ActualBase[] ActualExperienceAdjustmentOnPremium.ByAmountTypeAndEstimateType => Enumerable.Empty<ActualBase>().ToArray();",
+                "\npublic interface DefaultValueActualExperienceAdjustmentOnPremium : ActualExperienceAdjustmentOnPremium{",
+                "\n    double ActualExperienceAdjustmentOnPremium.Value => default;",
+                "\n}",
+                "\n",
+                "\npublic interface ActualExperienceAdjustmentOnPremiumForPaa : ActualExperienceAdjustmentOnPremium{",
+                "\n    double ActualExperienceAdjustmentOnPremium.Value => GetScope<PremiumRevenue>(Identity with {AocType = AocTypes.AM, Novelty = Novelties.C}).Value;",
                 "\n}"
             ],
             "metadata": {},
@@ -177,12 +181,16 @@
         {
             "cell_type": "code",
             "source": [
-                "public interface TechnicalMarginAmountType : IScope<(string DataNode, string EstimateType), ImportStorage>",
+                "public interface TechnicalMarginAmountType : IScope<(ImportIdentity Id, string EstimateType), ImportStorage>",
                 "\n{",
-                "\n    private IEnumerable<string> amountTypesToExclude => Identity.EstimateType == EstimateTypes.LR",
-                "\n        ? GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetAttributableExpenses())",
-                "\n        : GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce());",
-                "\n    IEnumerable<string> Values => GetScope<ValidAmountType>(Identity.DataNode).BeAmountTypes.Except(amountTypesToExclude);",
+                "\n    protected IEnumerable<string> amountTypesToExclude => (Identity.EstimateType, Identity.Id.ValuationApproach) switch {",
+                "\n        (EstimateTypes.LR, ValuationApproaches.PAA) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetAttributableExpenses()).Concat(GetStorage().GetDeferrableExpenses()).Concat(GetStorage().GetPremiums()),",
+                "\n        (EstimateTypes.LR, _) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetAttributableExpenses()),",
+                "\n        (_, ValuationApproaches.PAA) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetDeferrableExpenses()).Concat(GetStorage().GetPremiums()),",
+                "\n        (_) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce())",
+                "\n    };",
+                "\n",
+                "\n    IEnumerable<string> Values => GetScope<ValidAmountType>(Identity.Id.DataNode).BeAmountTypes.Except(amountTypesToExclude);",
                 "\n}"
             ],
             "metadata": {},
@@ -266,11 +274,12 @@
                 "\n                                               .WithApplicability<TechnicalMarginForEA>(x => x.Identity.AocType == AocTypes.EA && !x.Identity.IsReinsurance)",
                 "\n                                               .WithApplicability<TechnicalMarginForAM>(x => x.Identity.AocType == AocTypes.AM)",
                 "\n                                               .WithApplicability<TechnicalMarginForEop>(x => x.Identity.AocType == AocTypes.EOP)",
+                "\n                                               .WithApplicability<TechnicalMarginForPaa>(x => x.Identity.ValuationApproach == ValuationApproaches.PAA)",
                 "\n                                               );",
                 "\n    ",
                 "\n    protected string estimateType => GetContext();",
                 "\n    [NotVisible] string EconomicBasis => EconomicBases.L;",
-                "\n    double Value => GetScope<TechnicalMarginAmountType>((Identity.DataNode, estimateType)).Values ////TODO. PAA should use PR-Revenue and DAE-Allocated (allocated to the period)? ",
+                "\n    double Value => GetScope<TechnicalMarginAmountType>((Identity, estimateType)).Values",
                 "\n                       .Sum(at => GetScope<PresentValue>((Identity, at, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) +",
                 "\n                       GetScope<PresentValue>((Identity, (string)null, EstimateTypes.RA, (int?)null), o => o.WithContext(EconomicBasis)).Value;",
                 "\n                    ",
@@ -282,6 +291,14 @@
                 "\n    [NotVisible] string TechnicalMargin.EconomicBasis => EconomicBases.C;",
                 "\n}",
                 "\n",
+                "\npublic interface TechnicalMarginForPaa : TechnicalMargin{",
+                "\n    [NotVisible] string TechnicalMargin.EconomicBasis => EconomicBases.C;",
+                "\n    double TechnicalMargin.Value => GetScope<TechnicalMarginAmountType>((Identity, estimateType)).Values",
+                "\n                       .Sum(at => GetScope<PresentValue>((Identity, at, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) +",
+                "\n                       GetScope<PresentValue>((Identity, (string)null, EstimateTypes.RA, (int?)null), o => o.WithContext(EconomicBasis)).Value +",
+                "\n                       GetScope<DiscountedDeferrable>(Identity).Value + GetScope<PremiumRevenue>(Identity).Value;",
+                "\n}",
+                "\n",
                 "\npublic interface TechnicalMarginForBopProjection: TechnicalMargin{",
                 "\n    double TechnicalMargin.Value => GetScope<TechnicalMargin>(Identity with {AocType = AocTypes.EOP, Novelty = Novelties.C, ProjectionPeriod = Identity.ProjectionPeriod - 1}).Value;  ",
                 "\n}",
@@ -298,40 +315,33 @@
                 "\n    double TechnicalMargin.Value => default;",
                 "\n}",
                 "\n",
-                "\npublic interface TechnicalMarginForIA : TechnicalMargin{",
-                "\n    private int timeStep => GetStorage().GetTimeStep(Identity.ProjectionPeriod);",
-                "\n    private int shift => GetStorage().GetShift(Identity.ProjectionPeriod);",
-                "\n    ",
-                "\n    private double[] monthlyInterestFactor => GetScope<MonthlyRate>(Identity, o => o.WithContext(EconomicBasis)).Interest;",
-                "\n    ",
-                "\n    private double interestAccretionFactor => Enumerable.Range(shift,timeStep)",
-                "\n                                                    .Select(i => monthlyInterestFactor.GetValidElement(i/12))",
-                "\n                                                    .Aggregate(1d, (x, y) => x * y ) - 1d;",
-                "\n    ",
-                "\n    double TechnicalMargin.Value => AggregatedValue * interestAccretionFactor;",
+                "\npublic interface TechnicalMarginForIA : TechnicalMargin, InterestAccretionFactor{",
+                "\n    double TechnicalMargin.Value => AggregatedValue * GetInterestAccretionFactor(EconomicBasis);",
                 "\n}",
                 "\n",
                 "\npublic interface TechnicalMarginForEA : TechnicalMargin{",
                 "\n    static ApplicabilityBuilder ScopeApplicabilityBuilderInner(ApplicabilityBuilder builder) => ",
-                "\n        builder.ForScope<TechnicalMargin>(s => s.WithApplicability<TechnicalMarginDefaultValue>(x => x.Identity.IsReinsurance));",
-                "\n                                               ",
-                "\n    private string referenceAocType => GetScope<ReferenceAocStep>(Identity).Values.First().AocType;// ReferenceAocStep of EA is CF",
-                "\n    ",
-                "\n    private double premiums => GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow)",
-                "\n                                    .Sum(n => GetScope<BeExperienceAdjustmentForPremium>(Identity with {AocType = referenceAocType, Novelty = n}).ByAmountType.Sum(sc => sc.Value)) -",
-                "\n                                GetScope<ActualExperienceAdjustmentOnPremium>(Identity with {AocType = referenceAocType, Novelty = Novelties.C}).ByAmountTypeAndEstimateType.Sum(sc => sc.Value);",
-                "\n                           ",
-                "\n    private double attributableExpenseAndCommissions => GetStorage().GetAttributableExpenseAndCommissionAmountType().Sum(d =>",
-                "\n                                                         GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow)",
-                "\n                                                                     .Sum(n => GetScope<PresentValue>((Identity with {AocType = referenceAocType, Novelty = n}, d, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
-                "\n                                                         GetScope<ActualBase>((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, d, EstimateTypes.A, (int?)null)).Value);",
-                "\n",
-                "\n    private double investmentClaims => GetStorage().GetInvestmentClaims().Sum(ic =>",
-                "\n                                         GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow)",
-                "\n                                                     .Sum(n => GetScope<PresentValue>((Identity with {AocType = referenceAocType, Novelty = n}, ic, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
-                "\n                                         GetScope<ActualBase>((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, ic, EstimateTypes.A, (int?)null)).Value);",
+                "\n        builder.ForScope<TechnicalMarginForEA>(s => s",
+                "\n            .WithApplicability<TechnicalMarginDefaultValue>(x => x.Identity.IsReinsurance)",
+                "\n            .WithApplicability<TechnicalMarginForEAForPaa>(x => x.Identity.ValuationApproach == ValuationApproaches.PAA)",
+                "\n        );",
+                "\n    protected string referenceAocType => GetScope<ReferenceAocStep>(Identity).Values.First().AocType;// ReferenceAocStep of EA is CF",
+                "\n    protected double premiums => GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow)",
+                "\n        .Sum(n => GetScope<BeExperienceAdjustmentForPremium>(Identity with {AocType = referenceAocType, Novelty = n}, o => o.WithContext(EconomicBasis)).Value) -",
+                "\n        GetScope<ActualExperienceAdjustmentOnPremium>(Identity with {AocType = referenceAocType, Novelty = Novelties.C}).Value;",
+                "\n    protected double deferrable => GetStorage().GetDeferrableExpenses().Sum(d =>",
+                "\n        GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow).Sum(n => GetScope<PresentValue>((Identity with {AocType = referenceAocType, Novelty = n}, d, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
+                "\n        GetScope<ActualBase>((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, d, EstimateTypes.A, (int?)null)).Value);",
+                "\n    protected double investmentClaims => GetStorage().GetInvestmentClaims().Sum(ic =>",
+                "\n        GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow).Sum(n => GetScope<PresentValue>((Identity with {AocType = referenceAocType, Novelty = n}, ic, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
+                "\n        GetScope<ActualBase>((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, ic, EstimateTypes.A, (int?)null)).Value);",
                 "\n    ",
-                "\n    double TechnicalMargin.Value => premiums + attributableExpenseAndCommissions + investmentClaims;",
+                "\n    double TechnicalMargin.Value => premiums + deferrable + investmentClaims;",
+                "\n}",
+                "\n",
+                "\npublic interface TechnicalMarginForEAForPaa: TechnicalMarginForEA {",
+                "\n    double TechnicalMarginForEA.deferrable => GetScope<DiscountedDeferrable>(Identity with {AocType = AocTypes.AM, Novelty = Novelties.C}).Value -",
+                "\n        GetStorage().GetDeferrableExpenses().Sum(d => GetScope<ActualBase>((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, d, EstimateTypes.A, (int?)null)).Value);",
                 "\n}",
                 "\n",
                 "\npublic interface TechnicalMarginForAM : TechnicalMargin{",
@@ -343,9 +353,11 @@
                 "\n",
                 "\npublic interface TechnicalMarginForAmForPaa : TechnicalMargin{",
                 "\n    private IEnumerable<string> novelties => GetStorage().GetNovelties(AocTypes.CF).Where(novelty => novelty != Novelties.C);",
-                "\n    double TechnicalMargin.Value =>  GetScope<TechnicalMarginAmountType>((Identity.DataNode, estimateType)).Values",
+                "\n    double TechnicalMargin.Value =>  GetScope<TechnicalMarginAmountType>((Identity, estimateType)).Values",
                 "\n                                   .Sum(at => novelties.Sum(n => GetScope<PresentValue>((Identity with {AocType = AocTypes.CF, Novelty = n}, at, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value + ",
                 "\n                                                                 GetScope<PresentValue>((Identity with {AocType = AocTypes.CF, Novelty = n}, (string)null, EstimateTypes.RA, (int?)null), o => o.WithContext(EconomicBasis)).Value));",
+                "\n//+  Revenue AM + Deferral AM",
+                "\n",
                 "\n}",
                 "\n",
                 "\npublic interface TechnicalMarginForEop : TechnicalMargin{",
diff --git a/ifrs17/Import/5ImportScope-ToIfrsVar.ipynb b/ifrs17/Import/5ImportScope-ToIfrsVar.ipynb
index 5045632c..fb55d548 100644
--- a/ifrs17/Import/5ImportScope-ToIfrsVar.ipynb
+++ b/ifrs17/Import/5ImportScope-ToIfrsVar.ipynb
@@ -256,8 +256,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "## Deferrable",
-                "\n### Actual"
+                "## Deferrable"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -266,61 +265,56 @@
         {
             "cell_type": "code",
             "source": [
-                "public interface DeferrableActualToIfrsVariable: IScope<ImportIdentity, ImportStorage>",
-                "\n{",
-                "\n    IEnumerable<IfrsVariable> DeferrableActual => GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LIC //todo move up in the scope chain(is this correct?)",
-                "\n        ? Enumerable.Empty<IfrsVariable>()",
-                "\n        : GetScope<DeferrableActual>(Identity).RepeatOnce().Select(x => ",
-                "\n        new IfrsVariable{ EstimateType = x.EstimateType,",
-                "\n                          DataNode = x.Identity.DataNode,",
-                "\n                          AocType = x.Identity.AocType,",
-                "\n                          Novelty = x.Identity.Novelty,",
-                "\n                          AccidentYear = null,",
-                "\n                          Values = SetProjectionValue(x.Value, x.Identity.ProjectionPeriod),",
-                "\n                          Partition = GetStorage().TargetPartition });",
-                "\n}"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "markdown",
-            "source": [
-                "### Cashflow"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "public interface DeferrableCashflowToIfrsVariable: IScope<ImportIdentity, ImportStorage>",
+                "public interface DeferrableToIfrsVariable: IScope<ImportIdentity, ImportStorage>",
                 "\n{",
+                "\n    protected string EconomicBasis => GetStorage().GetEconomicBasisDriver(Identity.DataNode);",
                 "\n    private int timeStep => GetStorage().GetTimeStep(Identity.ProjectionPeriod); ",
                 "\n",
-                "\n    IEnumerable<IfrsVariable> Deferrable => GetStorage().GetEconomicBasisDriver(Identity.DataNode) switch {",
+                "\n    IEnumerable<IfrsVariable> Deferrable => EconomicBasis switch {",
                 "\n        EconomicBases.N => Enumerable.Range(0, timeStep).SelectMany(shift => ",
                 "\n            GetScope<NominalDeferrable>((Identity, shift)).RepeatOnce()",
-                "\n            .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
+                "\n                .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
                 "\n                          EconomicBasis = EconomicBases.N,",
                 "\n                          DataNode = x.Identity.Id.DataNode,",
                 "\n                          AocType = x.Identity.Id.AocType,",
                 "\n                          Novelty = x.Identity.Id.Novelty,",
                 "\n                          AccidentYear = shift,",
                 "\n                          Values = SetProjectionValue(x.Value, x.Identity.Id.ProjectionPeriod),",
-                "\n                          Partition = GetStorage().TargetPartition }",
-                "\n                          )),",
+                "\n                          Partition = GetStorage().TargetPartition })),",
                 "\n        _ => GetScope<DiscountedDeferrable>(Identity).RepeatOnce()",
-                "\n            .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
+                "\n                .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
                 "\n                          EconomicBasis = x.EconomicBasis,",
                 "\n                          DataNode = x.Identity.DataNode,",
                 "\n                          AocType = x.Identity.AocType,",
                 "\n                          Novelty = x.Identity.Novelty,",
                 "\n                          Values = SetProjectionValue(x.Value, x.Identity.ProjectionPeriod),",
-                "\n                          Partition = GetStorage().TargetPartition }",
-                "\n                          ),",
+                "\n                          Partition = GetStorage().TargetPartition }),",
+                "\n    };",
+                "\n",
+                "\n    private IEnumerable<IfrsVariable> amortizationStep => Deferrable.Where(iv => iv.Values != null).Where(iv => Math.Abs(iv.Values.GetValidElement(Identity.ProjectionPeriod)) > Precision);",
+                "\n",
+                "\n    IEnumerable<IfrsVariable> DeferrableAmFactor => (Identity.AocType, amortizationStep.Any(), EconomicBasis) switch {",
+                "\n        (AocTypes.AM, true, EconomicBases.N) => amortizationStep.Select(x => x.AccidentYear.Value).SelectMany(shift => ",
+                "\n            GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.DAE, shift), o => o.WithContext(EconomicBases.N)).RepeatOnce() //hardcoded AmountType: DAE for pattern",
+                "\n                .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
+                "\n                          EconomicBasis = EconomicBases.N,",
+                "\n                          DataNode = x.Identity.Id.DataNode,",
+                "\n                          AocType = Identity.AocType,",
+                "\n                          Novelty = Identity.Novelty,",
+                "\n                          AmountType = x.EffectiveAmountType,",
+                "\n                          AccidentYear = shift,",
+                "\n                          Values = SetProjectionValue(x.Value, x.Identity.Id.ProjectionPeriod),",
+                "\n                          Partition = GetStorage().TargetPartition })),",
+                "\n        (AocTypes.AM, true, _) => GetScope<DiscountedAmortizationFactorForDeferrals>(Identity, o => o.WithContext(EconomicBasis)).RepeatOnce()",
+                "\n            .Select(x => new IfrsVariable{ EstimateType = EstimateTypes.F,",
+                "\n                          EconomicBasis = EconomicBasis,",
+                "\n                          DataNode = x.Identity.DataNode,",
+                "\n                          AocType = x.Identity.AocType,",
+                "\n                          Novelty = x.Identity.Novelty,",
+                "\n                          AmountType = x.EffectiveAmountType,",
+                "\n                          Values = SetProjectionValue(x.Value, x.Identity.ProjectionPeriod),",
+                "\n                          Partition = GetStorage().TargetPartition }),",
+                "\n        (_) => Enumerable.Empty<IfrsVariable>(),",
                 "\n    };",
                 "\n}"
             ],
@@ -331,30 +325,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "### Deferrable"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "public interface DeferrableToIfrsVariable: IScope<ImportIdentity, ImportStorage>",
-                "\n{",
-                "\n    IEnumerable<IfrsVariable> Deferrable => GetStorage().DataNodeDataBySystemName[Identity.DataNode].ValuationApproach == ValuationApproaches.PAA",
-                "\n        ? GetScope<DeferrableCashflowToIfrsVariable>(Identity).Deferrable",
-                "\n        : GetScope<DeferrableActualToIfrsVariable>(Identity).DeferrableActual;",
-                "\n}"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "markdown",
-            "source": [
-                "### Amortzation Factor"
+                "## Premium Revenues"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -363,29 +334,28 @@
         {
             "cell_type": "code",
             "source": [
-                "public interface DeferrableAmortizationFactorToIfrsVariable: IScope<ImportIdentity, ImportStorage>",
+                "public interface RevenueToIfrsVariable: IScope<ImportIdentity, ImportStorage>",
                 "\n{",
-                "\n    private string EconomicBasis => GetStorage().GetEconomicBasisDriver(Identity.DataNode);",
-                "\n    private bool hasAmortizationStep => GetStorage().DataNodeDataBySystemName[Identity.DataNode].ValuationApproach == ValuationApproaches.PAA",
-                "\n        ? GetScope<DeferrableCashflowToIfrsVariable>(Identity).Deferrable.Where(iv => iv.Values != null).Any(iv => Math.Abs(iv.Values.GetValidElement(Identity.ProjectionPeriod)) > Precision)",
-                "\n        : GetScope<DeferrableActualToIfrsVariable>(Identity).DeferrableActual.Where(iv => iv.Values != null).Any(iv => Math.Abs(iv.Values.GetValidElement(Identity.ProjectionPeriod)) > Precision);",
+                "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
+                "\n        builder.ForScope<RevenueToIfrsVariable>(s => s",
+                "\n            .WithApplicability<EmptyRevenue>(x => !(x.Identity.ValuationApproach == ValuationApproaches.PAA && x.GetStorage().DataNodeDataBySystemName[x.Identity.DataNode].LiabilityType == LiabilityTypes.LRC)));",
                 "\n",
-                "\n    IEnumerable<IfrsVariable> DeferrableAmFactor => (hasAmortizationStep, GetStorage().GetEconomicBasisDriver(Identity.DataNode), Identity.AocType, GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType) switch {",
-                "\n        (true, EconomicBases.N, AocTypes.AM, LiabilityTypes.LRC) => GetScope<DeferrableCashflowToIfrsVariable>(Identity).Deferrable",
-                "\n            .Where(x => x.Values != null && Math.Abs(x.Values.GetValidElement(Identity.ProjectionPeriod)) >= Precision)",
-                "\n            .Select(x => x.AccidentYear.Value).SelectMany(shift => ",
-                "\n            GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.DAE, shift), o => o.WithContext(EconomicBases.N)).RepeatOnce() //hardcoded AmountType: DAE for pattern",
-                "\n                .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
-                "\n                          EconomicBasis = EconomicBases.N,",
-                "\n                          DataNode = x.Identity.Id.DataNode,",
-                "\n                          AocType = Identity.AocType,",
-                "\n                          Novelty = Identity.Novelty,",
-                "\n                          AmountType = x.EffectiveAmountType,",
-                "\n                          AccidentYear = shift,",
-                "\n                          Values = SetProjectionValue(x.Value, x.Identity.Id.ProjectionPeriod),",
-                "\n                          Partition = GetStorage().TargetPartition }",
-                "\n                          )),",
-                "\n        (true, _, AocTypes.AM, LiabilityTypes.LRC) => GetScope<DiscountedAmortizationFactorForDeferrals>(Identity, o => o.WithContext(EconomicBasis)).RepeatOnce()",
+                "\n    protected string EconomicBasis => GetStorage().GetEconomicBasisDriver(Identity.DataNode);",
+                "\n    private int timeStep => GetStorage().GetTimeStep(Identity.ProjectionPeriod); ",
+                "\n",
+                "\n    IEnumerable<IfrsVariable> Revenue => GetScope<PremiumRevenue>(Identity).RepeatOnce()",
+                "\n            .Select(x => new IfrsVariable{ EstimateType = x.EstimateType,",
+                "\n                          EconomicBasis = x.EconomicBasis,",
+                "\n                          DataNode = x.Identity.DataNode,",
+                "\n                          AocType = x.Identity.AocType,",
+                "\n                          Novelty = x.Identity.Novelty,",
+                "\n                          Values = SetProjectionValue(x.Value, x.Identity.ProjectionPeriod),",
+                "\n                          Partition = GetStorage().TargetPartition });",
+                "\n    ",
+                "\n    private bool hasAmortizationStep => Revenue.Where(iv => iv.Values != null).Any(iv => Math.Abs(iv.Values.GetValidElement(Identity.ProjectionPeriod)) > Precision);",
+                "\n",
+                "\n    IEnumerable<IfrsVariable> RevenueAmFactor =>  Identity.AocType == AocTypes.AM && hasAmortizationStep",
+                "\n        ? GetScope<DiscountedAmortizationFactorForRevenues>(Identity, o => o.WithContext(EconomicBasis)).RepeatOnce()",
                 "\n            .Select(x => new IfrsVariable{ EstimateType = EstimateTypes.F,",
                 "\n                          EconomicBasis = EconomicBasis,",
                 "\n                          DataNode = x.Identity.DataNode,",
@@ -393,10 +363,12 @@
                 "\n                          Novelty = x.Identity.Novelty,",
                 "\n                          AmountType = x.EffectiveAmountType,",
                 "\n                          Values = SetProjectionValue(x.Value, x.Identity.ProjectionPeriod),",
-                "\n                          Partition = GetStorage().TargetPartition }",
-                "\n                          ),",
-                "\n        (_) => Enumerable.Empty<IfrsVariable>(),",
-                "\n    };",
+                "\n                          Partition = GetStorage().TargetPartition })",
+                "\n        : Enumerable.Empty<IfrsVariable>();",
+                "\n}",
+                "\npublic interface EmptyRevenue : RevenueToIfrsVariable{",
+                "\n    IEnumerable<IfrsVariable> RevenueToIfrsVariable.Revenue => Enumerable.Empty<IfrsVariable>();",
+                "\n    IEnumerable<IfrsVariable> RevenueToIfrsVariable.RevenueAmFactor => Enumerable.Empty<IfrsVariable>();",
                 "\n}"
             ],
             "metadata": {},
@@ -417,35 +389,29 @@
             "source": [
                 "public interface EaForPremiumToIfrsVariable: IScope<ImportIdentity, ImportStorage>",
                 "\n{",
-                "\n    IEnumerable<IfrsVariable> BeEAForPremium => GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LIC",
-                "\n                                                || Identity.IsReinsurance",
-                "\n                            ? Enumerable.Empty<IfrsVariable>()",
-                "\n                            : GetScope<BeExperienceAdjustmentForPremium>(Identity)",
-                "\n                              .ByAmountType",
-                "\n                              .Select(sc => new IfrsVariable{ EstimateType = GetScope<BeExperienceAdjustmentForPremium>(Identity).EstimateType, ",
-                "\n                                                              DataNode = sc.Identity.Id.DataNode, ",
-                "\n                                                              AocType = sc.Identity.Id.AocType, ",
-                "\n                                                              Novelty = sc.Identity.Id.Novelty, ",
-                "\n                                                              AccidentYear = sc.Identity.AccidentYear,",
-                "\n                                                              EconomicBasis = sc.EconomicBasis,",
-                "\n                                                              AmountType = sc.Identity.AmountType,",
-                "\n                                                              Values = SetProjectionValue(sc.Value, sc.Identity.Id.ProjectionPeriod),",
-                "\n                                                              Partition = sc.GetStorage().TargetPartition });",
+                "\n  private string EconomicBasis => GetStorage().GetEconomicBasisDriver(Identity.DataNode);",
+                "\n  IEnumerable<IfrsVariable> BeEAForPremium => GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LIC || Identity.IsReinsurance",
+                "\n    ? Enumerable.Empty<IfrsVariable>()",
+                "\n    : GetScope<BeExperienceAdjustmentForPremium>(Identity, o => o.WithContext(EconomicBasis)).RepeatOnce()",
+                "\n      .Select(sc => new IfrsVariable{ EstimateType = sc.EstimateType, ",
+                "\n                                      DataNode = sc.Identity.DataNode, ",
+                "\n                                      AocType = sc.Identity.AocType, ",
+                "\n                                      Novelty = sc.Identity.Novelty, ",
+                "\n                                      EconomicBasis = sc.EconomicBasis,",
+                "\n                                      AmountType = sc.AmountType,",
+                "\n                                      Values = SetProjectionValue(sc.Value, sc.Identity.ProjectionPeriod),",
+                "\n                                      Partition = sc.GetStorage().TargetPartition });",
                 "\n    ",
-                "\n    IEnumerable<IfrsVariable> ActEAForPremium => GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LIC",
-                "\n                                                 || Identity.IsReinsurance",
-                "\n                            ? Enumerable.Empty<IfrsVariable>()",
-                "\n                            : GetScope<ActualExperienceAdjustmentOnPremium>(Identity)",
-                "\n                                .ByAmountTypeAndEstimateType",
-                "\n                                .Select(sc => new IfrsVariable{ EstimateType = GetStorage().ExperienceAdjustEstimateTypeMapping[sc.Identity.EstimateType], ",
-                "\n                                                 DataNode = sc.Identity.Id.DataNode, ",
-                "\n                                                 AocType = sc.Identity.Id.AocType, ",
-                "\n                                                 Novelty = sc.Identity.Id.Novelty, ",
-                "\n                                                 AccidentYear = sc.Identity.AccidentYear,",
-                "\n                                                 //EconomicBasis = scope.EconomicBasis,",
-                "\n                                                 AmountType = sc.Identity.AmountType,",
-                "\n                                                 Values = SetProjectionValue(sc.Value, sc.Identity.Id.ProjectionPeriod),",
-                "\n                                                 Partition = GetStorage().TargetPartition });",
+                "\n  IEnumerable<IfrsVariable> ActEAForPremium => GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LIC || Identity.IsReinsurance",
+                "\n    ? Enumerable.Empty<IfrsVariable>()",
+                "\n    : GetScope<ActualExperienceAdjustmentOnPremium>(Identity).RepeatOnce()",
+                "\n        .Select(sc => new IfrsVariable{ EstimateType = sc.EstimateType, ",
+                "\n                         DataNode = sc.Identity.DataNode, ",
+                "\n                         AocType = sc.Identity.AocType, ",
+                "\n                         Novelty = sc.Identity.Novelty, ",
+                "\n                         AmountType = sc.AmountType,",
+                "\n                         Values = SetProjectionValue(sc.Value, sc.Identity.ProjectionPeriod),",
+                "\n                         Partition = GetStorage().TargetPartition });",
                 "\n}"
             ],
             "metadata": {},
@@ -470,7 +436,7 @@
                 "\n        builder.ForScope<TmToIfrsVariable>(s => s.WithApplicability<EmptyTmIfrsVariable>(x => ComputationHelper.AocStepWithNoCsm.Contains(new AocStep(x.Identity.AocType, x.Identity.Novelty))));",
                 "\n",
                 "\n    private string economicBasis => Identity.ValuationApproach == ValuationApproaches.VFA ? EconomicBases.C : EconomicBases.L;",
-                "\n    private IEnumerable<string> amountTypesForTm =>GetScope<TechnicalMarginAmountType>((Identity.DataNode, EstimateTypes.C)).Values;",
+                "\n    private IEnumerable<string> amountTypesForTm => GetScope<TechnicalMarginAmountType>((Identity, EstimateTypes.C)).Values;",
                 "\n    private bool hasTechnicalMargin => GetStorage().ImportFormat switch {",
                 "\n        ImportFormats.Cashflow => GetStorage().GetRawVariables(Identity.DataNode).Any(x => x.EstimateType == EstimateTypes.RA || ",
                 "\n            (x.EstimateType == EstimateTypes.BE && amountTypesForTm.Contains(x.AmountType))),",
@@ -491,7 +457,7 @@
                 "\n            });",
                 "\n",
                 "\n     IEnumerable<IfrsVariable> Loss => GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LIC ||",
-                "\n                                        (Identity.ValuationApproach == ValuationApproaches.PAA && !hasTechnicalMargin )",
+                "\n                                       (Identity.ValuationApproach == ValuationApproaches.PAA && !hasTechnicalMargin )",
                 "\n        ? Enumerable.Empty<IfrsVariable>()",
                 "\n        : Identity.IsReinsurance ",
                 "\n           ? GetScope<LossRecoveryComponent>(Identity).RepeatOnce()",
@@ -513,7 +479,7 @@
                 "\n                                              Partition = GetStorage().TargetPartition",
                 "\n                                           });",
                 "\n    ",
-                "\n    IEnumerable<IfrsVariable> AmortizationFactor => Identity.AocType == AocTypes.AM && Loss.Concat(Csms).Where(x => x.Values != null).Any(x => Math.Abs(x.Values.GetValidElement(Identity.ProjectionPeriod)) > Precision)",
+                "\n    IEnumerable<IfrsVariable> AmortizationFactor =>  Identity.AocType == AocTypes.AM && Loss.Concat(Csms).Where(x => x.Values != null).Any(x => Math.Abs(x.Values.GetValidElement(Identity.ProjectionPeriod)) > Precision)",
                 "\n        && GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType == LiabilityTypes.LRC && ",
                 "\n        (Identity.ValuationApproach != ValuationApproaches.PAA || hasTechnicalMargin )",
                 "\n        ? GetScope<CurrentPeriodAmortizationFactor>((Identity, AmountTypes.CU, 0), o => o.WithContext(economicBasis)).RepeatOnce()",
diff --git a/ifrs17/Import/6ImportScope-Compute.ipynb b/ifrs17/Import/6ImportScope-Compute.ipynb
index 3eb5c113..8b8d6f05 100644
--- a/ifrs17/Import/6ImportScope-Compute.ipynb
+++ b/ifrs17/Import/6ImportScope-Compute.ipynb
@@ -106,13 +106,20 @@
         {
             "cell_type": "code",
             "source": [
-                "public interface ComputeIfrsVarsCashflows : PvToIfrsVariable, RaToIfrsVariable, DeferrableToIfrsVariable, EaForPremiumToIfrsVariable, TmToIfrsVariable, NominalToIfrsVariable, DeferrableAmortizationFactorToIfrsVariable",
+                "public interface ComputeIfrsVarsCashflows : PvToIfrsVariable, RaToIfrsVariable, DeferrableToIfrsVariable, EaForPremiumToIfrsVariable, TmToIfrsVariable, NominalToIfrsVariable, RevenueToIfrsVariable",
                 "\n{",
-                "\n    private IEnumerable<IfrsVariable> amortizationFactors => AmortizationFactor.Union(DeferrableAmFactor, EqualityComparer<IfrsVariable>.Instance);",
+                "\n    IEnumerable<IfrsVariable> amortizationFactors => Identity.ValuationApproach switch {",
+                "\n        ValuationApproaches.PAA => AmortizationFactor.Union(DeferrableAmFactor, EqualityComparer<IfrsVariable>.Instance),",
+                "\n//.Union(RevenueAmFactor, EqualityComparer<IfrsVariable>.Instance),//No need to RevenueAmFactor as long as Revenue depends only on Cashflow",
+                "\n        _ => AmortizationFactor.Union(DeferrableAmFactor, EqualityComparer<IfrsVariable>.Instance),",
+                "\n    };",
                 "\n    ",
-                "\n    IEnumerable<IfrsVariable> CalculatedIfrsVariables => Identity.ValuationApproach switch {",
-                "\n        ValuationApproaches.VFA => PvCurrent.Concat(CumulatedNominal).Concat(RaCurrent).Concat(amortizationFactors)",
-                "\n                                   .Concat(BeEAForPremium).Concat(Deferrable).Concat(Csms).Concat(Loss),",
+                "\n    IEnumerable<IfrsVariable> CalculatedIfrsVariables => (Identity.ValuationApproach, GetStorage().DataNodeDataBySystemName[Identity.DataNode].LiabilityType) switch {",
+                "\n        (ValuationApproaches.VFA, _) => PvCurrent.Concat(CumulatedNominal).Concat(RaCurrent).Concat(amortizationFactors)",
+                "\n            .Concat(BeEAForPremium).Concat(Deferrable).Concat(Csms).Concat(Loss),",
+                "\n        (ValuationApproaches.PAA, LiabilityTypes.LIC) => PvLocked.Concat(PvCurrent).Concat(CumulatedNominal).Concat(RaCurrent).Concat(RaLocked),                           ",
+                "\n        (ValuationApproaches.PAA, LiabilityTypes.LRC) => PvLocked.Concat(RaLocked).Concat(amortizationFactors).Concat(BeEAForPremium)",
+                "\n            .Concat(Deferrable).Concat(Loss).Concat(Revenue),",
                 "\n        _ => PvLocked.Concat(PvCurrent).Concat(CumulatedNominal).Concat(RaCurrent).Concat(RaLocked).Concat(amortizationFactors)",
                 "\n             .Concat(BeEAForPremium).Concat(Deferrable).Concat(Csms).Concat(Loss),",
                 "\n    };",
diff --git a/ifrs17/Import/ImportStorage.ipynb b/ifrs17/Import/ImportStorage.ipynb
index c9a56321..cda8e305 100644
--- a/ifrs17/Import/ImportStorage.ipynb
+++ b/ifrs17/Import/ImportStorage.ipynb
@@ -126,7 +126,6 @@
                 "\n    public Dictionary<string, Novelty> NoveltyDimension { get; private set; }",
                 "\n    public Dictionary<string, EstimateType> EstimateTypeDimension { get; private set; }",
                 "\n    public Dictionary<string, HashSet<string>> EstimateTypesByImportFormat { get; private set; }",
-                "\n    public Dictionary<string, string> ExperienceAdjustEstimateTypeMapping { get; private set; } ",
                 "\n    public HashSet<string> ImportActualEstimateTypes => GetImportActualEstimateType();",
                 "\n",
                 "\n    //Constructor",
@@ -147,9 +146,7 @@
                 "\n        EstimateTypeDimension     = estimateTypes.ToDictionary(x => x.SystemName);",
                 "\n        AmountTypeDimension       = (await workspace.Query<AmountType>().ToArrayAsync()).ToDictionary(x => x.SystemName);",
                 "\n        NoveltyDimension          = (await workspace.Query<Novelty>().ToArrayAsync()).ToDictionary(x => x.SystemName);",
-                "\n        ",
-                "\n        ExperienceAdjustEstimateTypeMapping = new Dictionary<string,string>{{EstimateTypes.A, EstimateTypes.APA}}; //TODO move this logic",
-                "\n        ",
+                "\n                ",
                 "\n        //Hierarchy Cache",
                 "\n        await hierarchyCache.InitializeAsync<AmountType>();",
                 "\n        ",
@@ -203,8 +200,8 @@
                 "\n                                                                  ? interDataNodeParamByPeriod[CurrentPeriod].Select(param => param.DataNode == goc ? param.LinkedDataNode : param.DataNode).Where(goc => !primaryScopeFromParsedVariables.Contains(goc))",
                 "\n                                                                  : Enumerable.Empty<string>())",
                 "\n                                            .ToHashSet();",
-                "\n",
-                "\n        var primaryScope = primaryScopeFromParsedVariables.Concat(primaryScopeFromLinkedReinsurance).ToHashSet();",
+                "\n        var primaryScopeForPaaLrc = DataNodeDataBySystemName.Values.Where(dn => dn.LiabilityType == LiabilityTypes.LRC && dn.ValuationApproach == ValuationApproaches.PAA).Select(dn => dn.DataNode).ToHashSet();",
+                "\n        var primaryScope = primaryScopeFromParsedVariables.Concat(primaryScopeFromLinkedReinsurance).Concat(primaryScopeForPaaLrc).ToHashSet();",
                 "\n        var secondaryScope = InterDataNodeParametersByGoc",
                 "\n                            .Where(kvp => primaryScope.Contains(kvp.Key))",
                 "\n                            .SelectMany(kvp => { var linkedGocs = kvp.Value[CurrentPeriod].Select(param => param.DataNode == kvp.Key ? param.LinkedDataNode : param.DataNode);",
@@ -282,17 +279,11 @@
                 "\n        ",
                 "\n        //Variables",
                 "\n        var rawVariables = parsedRawVariables.Concat(openingRawVariables)",
-                "\n                                             .Concat(await querySource.Query<RawVariable>()",
-                "\n                                                                      .Where(rv => rv.Partition == TargetPartition)",
-                "\n                                                                      .Where(rv => primaryScopeFromLinkedReinsurance.Contains(rv.DataNode)).ToArrayAsync()); ",
+                "\n            .Concat(await querySource.Query<RawVariable>().Where(rv => rv.Partition == TargetPartition).Where(rv => primaryScopeFromLinkedReinsurance.Contains(rv.DataNode)).ToArrayAsync()); ",
                 "\n        ",
                 "\n        var ifrsVariables = parsedIfrsVariables.Union(openingIfrsVariables, EqualityComparer<IfrsVariable>.Instance)",
-                "\n                                               .Concat(await querySource.Query<IfrsVariable>()",
-                "\n                                                                        .Where(iv => iv.Partition == TargetPartition && !(iv.AocType == AocTypes.BOP && iv.Novelty == Novelties.I))",
-                "\n                                                                        .Where(iv => primaryScopeFromParsedVariables.Contains(iv.DataNode) ",
-                "\n                                                                                     && !EstimateTypesByImportFormat[ImportFormat].Contains(iv.EstimateType)  ",
-                "\n                                                                                     || primaryScopeFromLinkedReinsurance.Contains(iv.DataNode) ",
-                "\n                                                                                     || secondaryScope.Contains(iv.DataNode)).ToArrayAsync());                                                                       ",
+                "\n            .Union(await querySource.Query<IfrsVariable>().Where(iv => iv.Partition == TargetPartition && !(iv.AocType == AocTypes.BOP && iv.Novelty == Novelties.I) && ",
+                "\n            primaryScope.Contains(iv.DataNode) || secondaryScope.Contains(iv.DataNode)).ToArrayAsync(), EqualityComparer<IfrsVariable>.Instance);                                                                       ",
                 "\n",
                 "\n        if(DefaultPartition != TargetPartition) {",
                 "\n            await querySource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(DefaultPartition);",
diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index 184c65d2..770e66c4 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -154,7 +154,7 @@
                 "\n        estimateTypes = args.ImportFormat switch {",
                 "\n                ImportFormats.SimpleValue => (await dataSource.Query<EstimateType>().ToArrayAsync()).Select(et => et.SystemName).ToHashSet(),",
                 "\n                ImportFormats.Opening => (await dataSource.Query<EstimateType>().Where(et => et.StructureType == StructureType.AoC).ToArrayAsync())",
-                "\n                                                                                .Where(et => et.InputSource.Contains(InputSource.Opening)) //This Contains overload cannot be used in DB",
+                "\n                                                                                .Where(et => et.InputSource.Contains(InputSource.Opening)) //This Contains overload cannot be used in DB, thus the ToArrayAsync()",
                 "\n                                                                                .Select(et => et.SystemName).ToHashSet(),",
                 "\n                _ => Enumerable.Empty<string>().ToHashSet(),",
                 "\n        };",
diff --git a/ifrs17/Report/ReportMutableScopes.ipynb b/ifrs17/Report/ReportMutableScopes.ipynb
index 53a64cd9..8d8d51d8 100644
--- a/ifrs17/Report/ReportMutableScopes.ipynb
+++ b/ifrs17/Report/ReportMutableScopes.ipynb
@@ -217,7 +217,7 @@
                 "\n}",
                 "\n",
                 "\npublic interface DeferralReport : IIfrs17Report {",
-                "\n    string[] IIfrs17Report.defaultRowSlices => new string[] {\"VariableType\"};",
+                "\n    string[] IIfrs17Report.defaultRowSlices => new string[] {nameof(ReportVariable.Novelty), nameof(ReportVariable.VariableType)};",
                 "\n    string[] IIfrs17Report.defaultColumnSlices => new string[] { \"Currency\"};",
                 "\n    IDataCube<ReportVariable> IIfrs17Report.GetDataCube() => ",
                 "\n        DataFilter == null ? GetScopes<Deferrals>(GetIdentities()).Aggregate().Deferrals",
@@ -233,7 +233,7 @@
                 "\n}",
                 "\n",
                 "\npublic interface ExpAdjReport : IIfrs17Report {",
-                "\n    string[] IIfrs17Report.defaultRowSlices => new string[] {\"EstimateType\"};",
+                "\n    string[] IIfrs17Report.defaultRowSlices => new string[] {\"AmountType\", \"EstimateType\"};",
                 "\n    string[] IIfrs17Report.defaultColumnSlices => new string[] { \"Currency\"};",
                 "\n    IDataCube<ReportVariable> IIfrs17Report.GetDataCube() => ",
                 "\n        DataFilter == null ? GetScopes<ExperienceAdjustment>(GetIdentities()).Aggregate().ActuarialExperienceAdjustment",
diff --git a/ifrs17/Report/ReportMutableScopesInteractive.ipynb b/ifrs17/Report/ReportMutableScopesInteractive.ipynb
index 7f16bd31..bfbd2e5d 100644
--- a/ifrs17/Report/ReportMutableScopesInteractive.ipynb
+++ b/ifrs17/Report/ReportMutableScopesInteractive.ipynb
@@ -742,7 +742,7 @@
                 "\n     void Init() {",
                 "\n         // BasicSliceAndDiceFormsEntity",
                 "\n         specificFilters = Enumerable.Empty<string>().ToArray();",
-                "\n         defaultRowSlices = new string[] { nameof(ReportVariable.VariableType) };",
+                "\n         defaultRowSlices = new string[] { nameof(ReportVariable.Novelty), nameof(ReportVariable.VariableType) };",
                 "\n         defaultColumnSlices = new string[] { nameof(ReportVariable.Currency) };",
                 "\n    }",
                 "\n}"
@@ -770,8 +770,8 @@
                 "\n",
                 "\n     void Init() {",
                 "\n         // BasicSliceAndDiceFormsEntity",
-                "\n         defaultRowSlices = new string[] { nameof(ReportVariable.EstimateType) };",
-                "\n         defaultColumnSlices = new string[] { nameof(ReportVariable.Currency), nameof(ReportVariable.AmountType) };",
+                "\n         defaultRowSlices = new string[] { nameof(ReportVariable.AmountType), nameof(ReportVariable.EstimateType) };",
+                "\n         defaultColumnSlices = new string[] { nameof(ReportVariable.Currency)};",
                 "\n         // SpecificFiltersFormEntity",
                 "\n         specificFilters = new string[] {nameof(ReportVariable.AmountType)};",
                 "\n    }",
diff --git a/ifrs17/Report/ReportScopes.ipynb b/ifrs17/Report/ReportScopes.ipynb
index 85793834..d3f1e95f 100644
--- a/ifrs17/Report/ReportScopes.ipynb
+++ b/ifrs17/Report/ReportScopes.ipynb
@@ -425,7 +425,7 @@
             "cell_type": "markdown",
             "source": [
                 "<a id='written-accrual-deferral'></a>",
-                "\n## Written, Accruals and Deferrals ",
+                "\n## Written, Accruals, Deferrals and Revenues",
                 "\n",
                 "\nWritten Actual (Actual) report includes contributions from the [Actual](../Import/3ImportScope-Actuals#actuals) import. ",
                 "\n<br> Accrual Actuals (Advance, Overdue Actual) report includes contributions from the [Advance](../Import/3ImportScope-Actuals#advance-actuals) and [Overdue](../Import/3ImportScope-Actuals#overdue-actuals) Actual calculation.",
@@ -459,6 +459,17 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "code",
+            "source": [
+                "public interface Revenues: IScope<(ReportIdentity Id, CurrencyType CurrencyType), ReportStorage>, IDataCube<ReportVariable> {",
+                "\n    IDataCube<ReportVariable> Revenues => GetScope<FxData>((Identity.Id, Identity.CurrencyType, EstimateTypes.R)).FxData;",
+                "\n}"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "markdown",
             "source": [
@@ -561,11 +572,18 @@
             "cell_type": "code",
             "source": [
                 "public interface LrcActuarial: IScope<(ReportIdentity Id, CurrencyType CurrencyType), ReportStorage>, IDataCube<ReportVariable> {",
+                "\n    static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
+                "\n        builder.ForScope<LrcActuarial>(s => s.WithApplicability<LrcActuarialPaa>(x => x.Identity.Id.ValuationApproach == ValuationApproaches.PAA));",
+                "\n",
                 "\n    private IDataCube<ReportVariable> Fcf => GetScope<CurrentFcf>(Identity).CurrentFcf.Filter((\"LiabilityType\", LiabilityTypes.LRC));",
                 "\n    private IDataCube<ReportVariable> Csm => GetScope<Csm>(Identity).Csm;",
-                "\n    private IDataCube<ReportVariable> Loreco => GetScope<Loreco>(Identity).Loreco;",
+                "\n    protected IDataCube<ReportVariable> Loreco => GetScope<Loreco>(Identity).Loreco;",
                 "\n    ",
                 "\n    IDataCube<ReportVariable> LrcActuarial => Fcf + Csm + Loreco;",
+                "\n}",
+                "\n",
+                "\npublic interface LrcActuarialPaa: LrcActuarial{",
+                "\n    IDataCube<ReportVariable> LrcActuarial.LrcActuarial => -1d * GetScope<Revenues>(Identity).Revenues + GetScope<Deferrals>(Identity).Deferrals + Loreco;",
                 "\n}"
             ],
             "metadata": {},
@@ -588,11 +606,11 @@
             "cell_type": "code",
             "source": [
                 "public interface Lrc: IScope<(ReportIdentity Id, CurrencyType CurrencyType), ReportStorage>, IDataCube<ReportVariable> {",
-                "\n    private IDataCube<ReportVariable> lrcActuarial => GetScope<LrcActuarial>(Identity).LrcActuarial;",
-                "\n    private IDataCube<ReportVariable> accrual => GetScope<WrittenAndAccruals>(Identity).Advance.Filter((\"LiabilityType\", LiabilityTypes.LRC)) + ",
+                "\n    protected IDataCube<ReportVariable> lrcActuarial => GetScope<LrcActuarial>(Identity).LrcActuarial;",
+                "\n    protected IDataCube<ReportVariable> accrual => GetScope<WrittenAndAccruals>(Identity).Advance.Filter((\"LiabilityType\", LiabilityTypes.LRC)) + ",
                 "\n                                                 GetScope<WrittenAndAccruals>(Identity).Overdue.Filter((\"LiabilityType\", LiabilityTypes.LRC));",
-                "\n    private IDataCube<ReportVariable> lrcData => lrcActuarial + accrual;",
-                "\n    ",
+                "\n    protected IDataCube<ReportVariable> lrcData => lrcActuarial + accrual;",
+                "\n",
                 "\n    private IDataCube<ReportVariable> bop => lrcData.Filter((\"VariableType\", AocTypes.BOP), (\"Novelty\", Novelties.I));",
                 "\n    private IDataCube<ReportVariable> delta => (lrcData.Filter((\"VariableType\",\"!BOP\"),(\"VariableType\",\"!EOP\")) + lrcData.Filter((\"VariableType\", AocTypes.BOP), (\"Novelty\", \"!I\")))",
                 "\n        .AggregateOver(nameof(Novelty), nameof(VariableType))",
@@ -1201,11 +1219,11 @@
                 "\n    private IDataCube<ReportVariable> WrittenCashflow => GetScope<WrittenAndAccruals>(Identity).Written.Filter((\"VariableType\", \"CF\"));",
                 "\n    private IDataCube<ReportVariable> AdvanceWriteOff => GetScope<WrittenAndAccruals>(Identity).Advance.Filter((\"VariableType\", \"WO\"));",
                 "\n    private IDataCube<ReportVariable> OverdueWriteOff => GetScope<WrittenAndAccruals>(Identity).Overdue.Filter((\"VariableType\", \"WO\"));",
-                "\n    private IDataCube<ReportVariable> EffectiveActuals => WrittenCashflow -1 * (AdvanceWriteOff + OverdueWriteOff);   ",
+                "\n    private IDataCube<ReportVariable> EffectiveActuals => WrittenCashflow -1 * (AdvanceWriteOff + OverdueWriteOff);",
+                "\n    private IDataCube<ReportVariable> Revenues => GetScope<Revenues>(Identity).Revenues.Filter((\"VariableType\", \"AM\"));",
                 "\n    ",
                 "\n    private IDataCube<ReportVariable> PaaPremiums => Identity.Id switch {",
-                "\n            { ValuationApproach: ValuationApproaches.PAA } => EffectiveActuals",
-                "\n                .Where(x => GetStorage().GetHierarchy<AmountType>().Ancestors(x.AmountType, includeSelf: true).Any(x => x.SystemName == AmountTypes.PR))",
+                "\n            { ValuationApproach: ValuationApproaches.PAA } => Revenues",
                 "\n                .SelectToDataCube(v => v with { Novelty = Novelties.C, VariableType = \"IR11\" }),",
                 "\n            _ => Enumerable.Empty<ReportVariable>().ToArray().ToDataCube()",
                 "\n    };",
diff --git a/ifrs17/Test/EqualityComparerTest.ipynb b/ifrs17/Test/EqualityComparerTest.ipynb
index e372e0cf..ef8a4a18 100644
--- a/ifrs17/Test/EqualityComparerTest.ipynb
+++ b/ifrs17/Test/EqualityComparerTest.ipynb
@@ -79,7 +79,7 @@
         {
             "cell_type": "code",
             "source": [
-                "comparer.Equals(yc,yc).Should().BeTrue()"
+                "comparer.Equals(yc,yc).Should().BeTrue();"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -88,7 +88,7 @@
         {
             "cell_type": "code",
             "source": [
-                "comparer.Equals(yc,null).Should().BeFalse()"
+                "comparer.Equals(yc,null).Should().BeFalse();"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -97,7 +97,7 @@
         {
             "cell_type": "code",
             "source": [
-                "comparer.Equals(yc,yc with { Month = 19}).Should().BeTrue()"
+                "comparer.Equals(yc,yc with { Month = 19}).Should().BeTrue();"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -106,7 +106,7 @@
         {
             "cell_type": "code",
             "source": [
-                "comparer.Equals(yc,yc with { Year = 2001}).Should().BeFalse()"
+                "comparer.Equals(yc,yc with { Year = 2001}).Should().BeFalse();"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -115,7 +115,7 @@
         {
             "cell_type": "code",
             "source": [
-                "comparer.Equals(yc, yc with {Year = 2001, Values = new[] { 0.002, 0.003, 0.004 } }).Should().BeTrue()"
+                "comparer.Equals(yc, yc with {Year = 2001, Values = new[] { 0.002, 0.003, 0.004 } }).Should().BeTrue();"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -124,7 +124,7 @@
         {
             "cell_type": "code",
             "source": [
-                "comparer.Equals(yc,yc with { Year = 1999}).Should().BeFalse()"
+                "comparer.Equals(yc,yc with { Year = 1999}).Should().BeFalse();"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -133,7 +133,16 @@
         {
             "cell_type": "code",
             "source": [
-                "comparer.Equals(yc,yc with { Year = 1999, Values = new[] { 0.001, 0.001, 0.002, 0.003, 0.004 } }).Should().BeTrue()"
+                "comparer.Equals(yc,yc with { Year = 1999, Values = new[] { 0.001, 0.001, 0.002, 0.003, 0.004 } }).Should().BeTrue();"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "comparer.Equals(yc,yc with {Values = new[] { 0.001, 0.001, 0.002, 0.003, 0.004 } }).Should().BeFalse();"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Test/ImportStorageTest.ipynb b/ifrs17/Test/ImportStorageTest.ipynb
index 2ae254c2..9a2f200c 100644
--- a/ifrs17/Test/ImportStorageTest.ipynb
+++ b/ifrs17/Test/ImportStorageTest.ipynb
@@ -359,6 +359,7 @@
                 "\n    basicIfrsVariable with {AocType = AocTypes.BOP, Novelty = Novelties.I, Values = new double[] {100.0}},",
                 "\n    basicIfrsVariable with {AocType = AocTypes.CF, Values = new double[] {-15.0}},",
                 "\n    basicIfrsVariable with {AocType = AocTypes.WO, Values = new double[] {-20.0}},",
+                "\n    basicIfrsVariable with {AocType = AocTypes.EOP, Values = new double[] {450.0}},",
                 "\n  };",
                 "\n",
                 "\nvar activity = await CheckIfrsVariableImportStorageAsync(inputForWorkspace, inputForDataSource, ivsBenchmark, args with {ImportFormat = ImportFormats.Actual});",
@@ -423,6 +424,7 @@
                 "\n    basicAdvanceActualIfrsVariable with {AocType = AocTypes.BOP, Novelty = Novelties.I, Values = new double[] {100.0}},",
                 "\n    basicAdvanceActualIfrsVariable with {AocType = AocTypes.CF, Values = new double[] {-15.0}},",
                 "\n    basicAdvanceActualIfrsVariable with {AocType = AocTypes.WO, Values = new double[] {-20.0}},",
+                "\n    basicAdvanceActualIfrsVariable with {AocType = AocTypes.EOP, Values = new double[] {450.0}},",
                 "\n  };",
                 "\n",
                 "\nvar activity = await CheckIfrsVariableImportStorageAsync(inputForWorkspace, inputForDataSource, ivsBenchmark, args with {ImportFormat = ImportFormats.Actual});",
diff --git a/ifrs17/Test/QueriesTest.ipynb b/ifrs17/Test/QueriesTest.ipynb
index 476e5d29..7232f5c1 100644
--- a/ifrs17/Test/QueriesTest.ipynb
+++ b/ifrs17/Test/QueriesTest.ipynb
@@ -783,7 +783,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var expectedErrorMessage = Get(Error.YieldCurveNotFound, \"EUR\",\"2016\",\"12\",\"Best Estimate\",\"A\");",
+                "var expectedErrorMessage = Get(Error.YieldCurveNotFound, \"DT1.1\", \"EUR\",\"2016\",\"12\",\"Best Estimate\",\"A\");",
                 "\nvar errorMessage = activity.Errors.First().ToString();",
                 "\nerrorMessage.Contains(expectedErrorMessage).Should().Be(true);"
             ],
@@ -822,7 +822,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var expectedErrorMessage = Get(Error.YieldCurveNotFound, \"EUR\",\"2016\",\"9\",\"Best Estimate\",\"A\");",
+                "var expectedErrorMessage = Get(Error.YieldCurveNotFound, \"DT1.1\", \"EUR\",\"2016\",\"9\",\"Best Estimate\",\"A\");",
                 "\nvar errorMessage = activity.Errors.First().ToString();",
                 "\nerrorMessage.Contains(expectedErrorMessage).Should().Be(true);"
             ],
diff --git a/ifrs17/Test/TechnicalMarginTest.ipynb b/ifrs17/Test/TechnicalMarginTest.ipynb
index 5e599287..fd11781a 100644
--- a/ifrs17/Test/TechnicalMarginTest.ipynb
+++ b/ifrs17/Test/TechnicalMarginTest.ipynb
@@ -73,7 +73,8 @@
             "cell_type": "code",
             "source": [
                 "await Import.FromString(amountType).WithType<AmountType>().WithTarget(DataSource).ExecuteAsync();",
-                "\nawait Import.FromString(estimateType).WithType<EstimateType>().WithTarget(DataSource).ExecuteAsync();"
+                "\nawait Import.FromString(estimateType).WithType<EstimateType>().WithTarget(DataSource).ExecuteAsync();",
+                "\nawait Import.FromString(economicBasis).WithType<EconomicBasis>().WithTarget(DataSource).ExecuteAsync();"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Test/TestData.ipynb b/ifrs17/Test/TestData.ipynb
index c148bb4a..e36137f7 100644
--- a/ifrs17/Test/TestData.ipynb
+++ b/ifrs17/Test/TestData.ipynb
@@ -202,7 +202,9 @@
                 "\nNE,Non Attributable Expenses,,110,BeginningOfPeriod,,,,,,,",
                 "\nAC,Attributable Commission,,120,BeginningOfPeriod,,,,,,,",
                 "\nACA,Aquisition,AC,130,BeginningOfPeriod,,,,,,,",
-                "\nACM,Maitenance,AC,140,BeginningOfPeriod,,,,,,,\";"
+                "\nACM,Maitenance,AC,140,BeginningOfPeriod,,,,,,,",
+                "\nDE,Deferrals,,200,EndOfPeriod,,,,,,,",
+                "\nDAE,Aquisition Expenses,DE,220,EndOfPeriod,,,,,,,\";"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Utils/ImportCalculationMethods.ipynb b/ifrs17/Utils/ImportCalculationMethods.ipynb
index 22e9bf30..3b8e7c6d 100644
--- a/ifrs17/Utils/ImportCalculationMethods.ipynb
+++ b/ifrs17/Utils/ImportCalculationMethods.ipynb
@@ -434,6 +434,7 @@
                 "\n        {new AocStep(AocTypes.AM, Novelties.C),  new []{new AocStep(AocTypes.CL, Novelties.C)}},",
                 "\n        {new AocStep(AocTypes.EOP, Novelties.C), new []{new AocStep(AocTypes.CL, Novelties.C)}}, ",
                 "\n    };    ",
+                "\n    public static Dictionary<string,string> ExperienceAdjustEstimateTypeMapping = new Dictionary<string,string> {{EstimateTypes.A, EstimateTypes.APA}, {EstimateTypes.BE, EstimateTypes.BEPA}};",
                 "\n} "
             ],
             "metadata": {},
diff --git a/ifrs17/Utils/Queries.ipynb b/ifrs17/Utils/Queries.ipynb
index 820469b0..593b57bc 100644
--- a/ifrs17/Utils/Queries.ipynb
+++ b/ifrs17/Utils/Queries.ipynb
@@ -201,7 +201,7 @@
                 "\n        var loadedYc = (await querySource.LoadCurrentParameterAsync<YieldCurve>(argsNew, x => x.Currency, x => x.Currency == dn.ContractualCurrency && x.Name == dn.YieldCurveName));",
                 "\n                                    ",
                 "\n        if (!loadedYc.TryGetValue(dn.ContractualCurrency, out var lockedYc))",
-                "\n            ApplicationMessage.Log(Error.YieldCurveNotFound, dn.ContractualCurrency, argsNew.Year.ToString(), argsNew.Month.ToString(), argsNew.Scenario, dn.YieldCurveName);",
+                "\n            ApplicationMessage.Log(Error.YieldCurveNotFound, dn.DataNode, dn.ContractualCurrency, argsNew.Year.ToString(), argsNew.Month.ToString(), argsNew.Scenario, dn.YieldCurveName);",
                 "\n        ",
                 "\n        lockedInYieldCurveByGoc[dn.DataNode] = lockedYc;",
                 "\n    }",