diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_C.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_C.csv
index cf8c8f5f..061f2e7e 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_C.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_C.csv
@@ -1,40 +1,40 @@
 @@Main
-Month,ReportingNode,Scenario,Year
-12,CH,,2020
+ReportingNode,Year,Month,Scenario
+CH,2020,12,
 @@C
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,AM,DTR1.1,,C,C,24.228134693791258
+,,AM,DTR1.1,,C,C,46.24958203305145
 ,,IA,DT1.3,,C,N,0.08233273235018213
 ,,BOP,DT1.3,,C,N,139.90849210284577
-,,EOP,DT1.3,,C,C,82.02271122089925
-,,AM,DT1.3,,C,C,-42.968113614296705
+,,EOP,DT1.3,,C,C,42.9681136142967
+,,AM,DT1.3,,C,C,-82.02271122089925
 ,,EA,DT1.3,,C,C,-15
 ,,EA,DT1.1,,C,C,-15
-,,AM,DT1.1,,C,C,-42.968113614296705
-,,EOP,DT1.1,,C,C,82.02271122089925
+,,AM,DT1.1,,C,C,-82.02271122089925
+,,EOP,DT1.1,,C,C,42.9681136142967
 ,,BOP,DT1.1,,C,N,139.90849210284577
 ,,IA,DT1.1,,C,N,0.08233273235018213
 ,,EA,DT2.1,,C,C,-15
-,,AM,DT2.1,,C,C,-42.968113614296705
-,,EOP,DT2.1,,C,C,82.02271122089925
+,,AM,DT2.1,,C,C,-82.02271122089925
+,,EOP,DT2.1,,C,C,42.9681136142967
 ,,BOP,DT2.1,,C,N,139.90849210284577
 ,,IA,DT2.1,,C,N,0.08233273235018213
-,,EOP,DTR1.1,,C,C,-46.24958203305145
+,,EOP,DTR1.1,,C,C,-24.22813469379126
 ,,BOP,DTR1.1,,C,N,-70.43538016962212
 ,,IA,DTR1.1,,C,N,-0.04233655722058882
-,,AM,DTR2.1,,C,C,24.228134693791258
-,,EOP,DTR2.1,,C,C,-46.24958203305145
+,,AM,DTR2.1,,C,C,46.24958203305145
+,,EOP,DTR2.1,,C,C,-24.22813469379126
 ,,BOP,DTR2.1,,C,N,-70.43538016962212
 ,,IA,DTR2.1,,C,N,-0.04233655722058882
 ,,BOP,DT3.1,,C,I,72.2
 ,,EA,DT3.1,,C,C,-15
-,,AM,DT3.1,,C,C,-67.83795828214956
-,,EOP,DT3.1,,C,C,129.49726655304642
+,,AM,DT3.1,,C,C,-129.49726655304642
+,,EOP,DT3.1,,C,C,67.83795828214957
 ,,IA,DT3.1,,C,I,0.14440000000001615
 ,,BOP,DT3.1,,C,N,139.90849210284577
 ,,IA,DT3.1,,C,N,0.08233273235018213
 ,,EA,DT4.1,,C,C,-15
-,,AM,DT4.1,,C,C,-42.968113614296705
-,,EOP,DT4.1,,C,C,82.02271122089925
+,,AM,DT4.1,,C,C,-82.02271122089925
+,,EOP,DT4.1,,C,C,42.9681136142967
 ,,BOP,DT4.1,,C,N,139.90849210284577
 ,,IA,DT4.1,,C,N,0.08233273235018213
\ No newline at end of file
diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_DA.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_DA.csv
index 0b2eb99d..900aadb2 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_DA.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_DA.csv
@@ -1,21 +1,20 @@
-$$Default
 @@Main
-Month,ReportingNode,Scenario,Year
-12,CH,,2020
+ReportingNode,Year,Month,Scenario
+CH,2020,12,
 @@DA
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,EOP,DT1.3,,DA,C,-9.843447868559382
-,,AM,DT1.3,,DA,C,5.156552131440618
+,,EOP,DT1.3,,DA,C,-5.156552131440618
+,,AM,DT1.3,,DA,C,9.843447868559382
 ,,CF,DT1.3,,DA,C,-15
 ,,CF,DT1.1,,DA,C,-15
-,,AM,DT1.1,,DA,C,5.156552131440618
-,,EOP,DT1.1,,DA,C,-9.843447868559382
+,,AM,DT1.1,,DA,C,9.843447868559382
+,,EOP,DT1.1,,DA,C,-5.156552131440618
 ,,CF,DT2.1,,DA,C,-15
-,,AM,DT2.1,,DA,C,5.156552131440618
-,,EOP,DT2.1,,DA,C,-9.843447868559382
+,,AM,DT2.1,,DA,C,9.843447868559382
+,,EOP,DT2.1,,DA,C,-5.156552131440618
 ,,CF,DT3.1,,DA,C,-15
-,,AM,DT3.1,,DA,C,5.156552131440618
-,,EOP,DT3.1,,DA,C,-9.843447868559382
+,,AM,DT3.1,,DA,C,9.843447868559382
+,,EOP,DT3.1,,DA,C,-5.156552131440618
 ,,CF,DT4.1,,DA,C,-15
-,,AM,DT4.1,,DA,C,5.156552131440618
-,,EOP,DT4.1,,DA,C,-9.843447868559382
\ No newline at end of file
+,,AM,DT4.1,,DA,C,9.843447868559382
+,,EOP,DT4.1,,DA,C,-5.156552131440618
\ No newline at end of file
diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_F.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_F.csv
index 91b1b7f4..8c0006b2 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_F.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2020_12_F.csv
@@ -1,17 +1,16 @@
-$$Default
 @@Main
-Month,ReportingNode,Scenario,Year
-12,CH,,2020
+ReportingNode,Year,Month,Scenario
+CH,2020,12,
 @@F
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,AM,DT1.1,L,F,C,0.3437701420960412
+,,AM,DT1.1,L,F,C,0.6562298579039588
 ,,AM,DT1.2,L,F,C,1
-,,AM,DT1.3,L,F,C,0.3437701420960412
-,,AM,DT2.1,L,F,C,0.3437701420960412
+,,AM,DT1.3,L,F,C,0.6562298579039588
+,,AM,DT2.1,L,F,C,0.6562298579039588
 ,,AM,DT2.2,L,F,C,1
-,,AM,DTR1.1,L,F,C,0.3437701420960412
+,,AM,DTR1.1,L,F,C,0.6562298579039588
 ,,AM,DTR1.2,L,F,C,1
-,,AM,DTR2.1,L,F,C,0.3437701420960412
+,,AM,DTR2.1,L,F,C,0.6562298579039588
 ,,AM,DTR2.2,L,F,C,1
-,,AM,DT3.1,L,F,C,0.3437701420960412
-,,AM,DT4.1,L,F,C,0.3437701420960412
\ No newline at end of file
+,,AM,DT3.1,L,F,C,0.6562298579039588
+,,AM,DT4.1,L,F,C,0.6562298579039588
\ No newline at end of file
diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_C.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_C.csv
index 965e5e6f..fdf3a318 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_C.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_C.csv
@@ -1,55 +1,54 @@
 @@Main
-Month,ReportingNode,Scenario,Year
-3,CH,,2021
+ReportingNode,Year,Month,Scenario
+CH,2021,3,
 @@C
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
 ,,CL,DT2.1,,C,C,-87.43135554903122
-,,IA,DT2.1,,C,I,0.09388697662967685
+,,IA,DT2.1,,C,I,0.07437430623754743
 ,,MC,DT2.1,,C,I,105.89201388261736
-,,EOP,DT2.1,,C,C,18.374757965777995
-,,AM,DT2.1,,C,C,-38.60249856533708
+,,EOP,DT2.1,,C,C,12.129509556366447
+,,AM,DT2.1,,C,C,-5.773636697753954
 ,,EA,DT2.1,,C,C,-43.599999999999994
-,,BOP,DT2.1,,C,I,82.02271122089925
+,,BOP,DT2.1,,C,I,42.9681136142967
 ,,CL,DT1.3,,C,C,-87.43135554903122
-,,BOP,DT1.1,,C,I,82.02271122089925
+,,BOP,DT1.1,,C,I,42.9681136142967
 ,,EA,DT1.1,,C,C,-43.599999999999994
-,,AM,DT1.1,,C,C,-38.60249856533708
-,,EOP,DT1.1,,C,C,18.374757965777995
+,,AM,DT1.1,,C,C,-5.773636697753954
+,,EOP,DT1.1,,C,C,12.129509556366447
 ,,MC,DT1.1,,C,I,105.89201388261736
-,,IA,DT1.1,,C,I,0.09388697662967685
+,,IA,DT1.1,,C,I,0.07437430623754743
 ,,CL,DT1.1,,C,C,-87.43135554903122
-,,BOP,DT1.3,,C,I,82.02271122089925
+,,BOP,DT1.3,,C,I,42.9681136142967
 ,,EA,DT1.3,,C,C,-50
-,,AM,DT1.3,,C,C,-34.26645281902704
-,,EOP,DT1.3,,C,C,16.31080371208803
+,,AM,DT1.3,,C,C,-3.7096824440639895
+,,EOP,DT1.3,,C,C,7.793463810056405
 ,,MC,DT1.3,,C,I,105.89201388261736
-,,IA,DT1.3,,C,I,0.09388697662967685
-,,BOP,DTR1.1,,C,I,-46.24958203305145
-,,AM,DTR1.1,,C,C,38.316584766326955
-,,EOP,DTR1.1,,C,C,-18.238663229656325
+,,IA,DT1.3,,C,I,0.07437430623754743
+,,BOP,DTR1.1,,C,I,-24.22813469379126
+,,AM,DTR1.1,,C,C,11.133355649364928
+,,EOP,DTR1.1,,C,C,-23.389442532110124
 ,,MC,DTR1.1,,C,I,-52.92295262051829
-,,IA,DTR1.1,,C,I,-0.04954912095471157
+,,IA,DTR1.1,,C,I,-0.03854664570667637
 ,,CRU,DTR1.1,,C,I,-0.5933128558860402
 ,,CL,DTR1.1,,C,C,43.26014863442721
-,,BOP,DTR2.1,,C,I,-46.24958203305145
-,,AM,DTR2.1,,C,C,38.316584766326955
-,,EOP,DTR2.1,,C,C,-18.238663229656325
+,,BOP,DTR2.1,,C,I,-24.22813469379126
+,,AM,DTR2.1,,C,C,11.133355649364928
+,,EOP,DTR2.1,,C,C,-23.389442532110124
 ,,MC,DTR2.1,,C,I,-52.92295262051829
-,,IA,DTR2.1,,C,I,-0.04954912095471157
+,,IA,DTR2.1,,C,I,-0.03854664570667637
 ,,CRU,DTR2.1,,C,I,-0.5933128558860402
 ,,CL,DTR2.1,,C,C,43.26014863442721
-,,BOP,DT3.1,,C,I,129.49726655304642
-,,EA,DT3.1,,C,C,-43.599999999999994
-,,AM,DT3.1,,C,C,-51.96181825867143
+,,BOP,DT3.1,,C,I,67.83795828214957
+,,EA,DT3.1,,C,C,-33.87170342894083
 ,,MC,DT3.1,,C,I,105.89201388261736
-,,IA,DT3.1,,C,I,0.11760647207910604
+,,IA,DT3.1,,C,I,0.08679991324534386
 ,,CL,DT3.1,,C,C,-139.94506864907146
-,,BOP,DT4.1,,C,I,82.02271122089925
+,,BOP,DT4.1,,C,I,42.9681136142967
 ,,EA,DT4.1,,C,C,-51.599999999999994
-,,AM,DT4.1,,C,C,-96.83022811966929
-,,EOP,DT4.1,,C,C,46.091109943532146
+,,AM,DT4.1,,C,C,-33.48998867550812
+,,EOP,DT4.1,,C,C,70.35723911069866
 ,,MC,DT4.1,,C,I,105.89201388261736
-,,IA,DT4.1,,C,I,0.09388697662967685
+,,IA,DT4.1,,C,I,0.07437430623754743
 ,,BOP,DT4.1,,C,N,8.004653973154419
 ,,IA,DT4.1,,C,N,0.0003356307173485902
 ,,EV,DT4.1,,C,N,-1.4922636208166304
\ No newline at end of file
diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_DA.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_DA.csv
index 437c7cf1..be7fcf90 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_DA.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_DA.csv
@@ -1,25 +1,24 @@
-$$Default
 @@Main
-Month,ReportingNode,Scenario,Year
-3,CH,,2021
+ReportingNode,Year,Month,Scenario
+CH,2021,3,
 @@DA
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,EOP,DT2.1,,DA,C,-8.011834360099684
-,,AM,DT2.1,,DA,C,16.831613508459697
-,,BOP,DT2.1,,DA,I,-9.843447868559382
+,,EOP,DT2.1,,DA,C,-13.656208145282752
+,,AM,DT2.1,,DA,C,6.500343986157867
+,,BOP,DT2.1,,DA,I,-5.156552131440618
 ,,CF,DT2.1,,DA,C,-15
 ,,CF,DT1.1,,DA,C,-15
-,,BOP,DT1.1,,DA,I,-9.843447868559382
-,,AM,DT1.1,,DA,C,16.831613508459697
-,,EOP,DT1.1,,DA,C,-8.011834360099684
+,,BOP,DT1.1,,DA,I,-5.156552131440618
+,,AM,DT1.1,,DA,C,6.500343986157867
+,,EOP,DT1.1,,DA,C,-13.656208145282752
 ,,CF,DT1.3,,DA,C,-15
-,,BOP,DT1.3,,DA,I,-9.843447868559382
-,,AM,DT1.3,,DA,C,16.831613508459697
-,,EOP,DT1.3,,DA,C,-8.011834360099684
+,,BOP,DT1.3,,DA,I,-5.156552131440618
+,,AM,DT1.3,,DA,C,6.500343986157867
+,,EOP,DT1.3,,DA,C,-13.656208145282752
 ,,CF,DT3.1,,DA,C,-15
-,,BOP,DT3.1,,DA,I,-9.843447868559382
-,,AM,DT3.1,,DA,C,24.84344786855938
+,,BOP,DT3.1,,DA,I,-5.156552131440618
+,,AM,DT3.1,,DA,C,20.15655213144062
 ,,CF,DT4.1,,DA,C,-15
-,,BOP,DT4.1,,DA,I,-9.843447868559382
-,,AM,DT4.1,,DA,C,16.831613508459697
-,,EOP,DT4.1,,DA,C,-8.011834360099684
\ No newline at end of file
+,,BOP,DT4.1,,DA,I,-5.156552131440618
+,,AM,DT4.1,,DA,C,6.500343986157867
+,,EOP,DT4.1,,DA,C,-13.656208145282752
\ No newline at end of file
diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_F.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_F.csv
index c443cf93..f7419efa 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_F.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_F.csv
@@ -1,17 +1,16 @@
-$$Default
 @@Main
-Month,ReportingNode,Scenario,Year
-3,CH,,2021
+ReportingNode,Year,Month,Scenario
+CH,2021,3,
 @@F
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
-,,AM,DT1.1,L,F,C,0.6775071478609433
+,,AM,DT1.1,L,F,C,0.32249285213905665
 ,,AM,DT1.2,L,F,C,1
-,,AM,DT1.3,L,F,C,0.6775071478609433
-,,AM,DT2.1,L,F,C,0.6775071478609433
+,,AM,DT1.3,L,F,C,0.32249285213905665
+,,AM,DT2.1,L,F,C,0.32249285213905665
 ,,AM,DT2.2,L,F,C,1
-,,AM,DTR1.1,L,F,C,0.6775071478609433
+,,AM,DTR1.1,L,F,C,0.32249285213905665
 ,,AM,DTR1.2,L,F,C,1
-,,AM,DTR2.1,L,F,C,0.6775071478609433
+,,AM,DTR2.1,L,F,C,0.32249285213905665
 ,,AM,DTR2.2,L,F,C,1
 ,,AM,DT3.1,L,F,C,1
-,,AM,DT4.1,L,F,C,0.6775071478609433
\ No newline at end of file
+,,AM,DT4.1,L,F,C,0.32249285213905665
\ No newline at end of file
diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_L.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_L.csv
index b4ae0c7e..9a6831e3 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_L.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_L.csv
@@ -1,7 +1,6 @@
-$$Default
 @@Main
-Month,ReportingNode,Scenario,Year
-3,CH,,2021
+ReportingNode,Year,Month,Scenario
+CH,2021,3,
 @@L
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
 ,,CL,DT2.1,,L,C,-87.43135554903122
@@ -16,6 +15,8 @@ AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Valu
 ,,BOP,DT1.3,,L,N,31.958738976731105
 ,,IA,DT1.3,,L,N,0.016300537999407044
 ,,EV,DT1.3,,L,N,55.45631603430072
+,,EA,DT3.1,,L,C,9.728296571059161
+,,AM,DT3.1,,L,C,-9.728296571059161
 ,,BOP,DT3.1,,L,N,31.958738976731105
 ,,IA,DT3.1,,L,N,0.016300537999407044
 ,,EV,DT3.1,,L,N,55.45631603430072
diff --git a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_LR.csv b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_LR.csv
index 93205b6d..0596dea4 100644
--- a/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_LR.csv
+++ b/full-ifrs17-template/Test/Data/IfrsVariableBenchmarks/BM_CH_2021_3_LR.csv
@@ -1,6 +1,6 @@
 @@Main
-Month,ReportingNode,Scenario,Year
-3,CH,,2021
+ReportingNode,Year,Month,Scenario
+CH,2021,3,
 @@LR
 AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
 ,,BOP,DTR1.1,,LR,N,-15.684995728561214
diff --git a/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv b/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv
index 8b78df02..80bfedb2 100644
--- a/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv
+++ b/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv
@@ -34,19 +34,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,399.6339294988556,OCI1
 0,NIC,2020,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-299.675549694236,OCI1
 0,PR,2020,USD,L,BEPA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,320,IR6
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-42.968113614296705,AM
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-82.02271122089925,AM
 0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,139.90849210284577,BOP
 0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-15,EA
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,82.02271122089925,EOP
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,42.9681136142967,EOP
 0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,0.08233273235018213,IA
 0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-0.08233273235018213,IFIE1
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,42.968113614296705,IR3
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,82.02271122089925,IR3
 0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-124.90849210284577,IR5
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,5.156552131440618,AM
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,9.843447868559382,AM
 0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-9.843447868559382,EOP
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,5.156552131440618,IR4
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-5.156552131440618,ISE6
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-5.156552131440618,EOP
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,9.843447868559382,IR4
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-9.843447868559382,ISE6
 0,,2020,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,C,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,L,RA,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,-30,CF
@@ -119,19 +119,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,399.6339294988556,OCI1
 0,NIC,2020,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-299.675549694236,OCI1
 0,PR,2020,USD,L,BEPA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,400,IR6
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-42.968113614296705,AM
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-82.02271122089925,AM
 0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,139.90849210284577,BOP
 0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-15,EA
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,82.02271122089925,EOP
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,42.9681136142967,EOP
 0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,0.08233273235018213,IA
 0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-0.08233273235018213,IFIE1
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,42.968113614296705,IR3
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,82.02271122089925,IR3
 0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-124.90849210284577,IR5
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,5.156552131440618,AM
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,9.843447868559382,AM
 0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-9.843447868559382,EOP
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,5.156552131440618,IR4
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-5.156552131440618,ISE6
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-5.156552131440618,EOP
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,9.843447868559382,IR4
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-9.843447868559382,ISE6
 0,,2020,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,C,RA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,L,RA,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,-30,CF
@@ -176,19 +176,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,0,OCI1
 0,NIC,2020,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,0,OCI1
 0,PR,2020,USD,L,BEPA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,320,IR6
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-42.968113614296705,AM
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-82.02271122089925,AM
 0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,0,CH,,BBA,139.90849210284577,BOP
 0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-15,EA
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,82.02271122089925,EOP
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,42.9681136142967,EOP
 0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,0,CH,,BBA,0.08233273235018213,IA
 0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-0.08233273235018213,IFIE1
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,42.968113614296705,IR3
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,82.02271122089925,IR3
 0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-124.90849210284577,IR5
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,5.156552131440618,AM
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,9.843447868559382,AM
 0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-9.843447868559382,EOP
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,5.156552131440618,IR4
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-5.156552131440618,ISE6
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-5.156552131440618,EOP
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,9.843447868559382,IR4
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-9.843447868559382,ISE6
 0,,2020,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,C,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,L,RA,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,0,CH,,BBA,-30,CF
@@ -260,21 +260,21 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,399.6339294988556,OCI1
 0,NIC,2020,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-299.675549694236,OCI1
 0,PR,2020,USD,L,BEPA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,320,IR6
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-67.83795828214956,AM
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-129.49726655304642,AM
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,72.2,BOP
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,0,CH,,BBA,139.90849210284577,BOP
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-15,EA
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,129.49726655304642,EOP
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,67.83795828214956,EOP
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,0.14440000000001615,IA
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,0,CH,,BBA,0.08233273235018213,IA
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-0.22673273235019828,IFIE1
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,67.83795828214956,IR3
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,129.49726655304642,IR3
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-124.90849210284577,IR5
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,5.156552131440618,AM
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,9.843447868559382,AM
 0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-9.843447868559382,EOP
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,5.156552131440618,IR4
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-5.156552131440618,ISE6
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-5.156552131440618,EOP
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,9.843447868559382,IR4
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-9.843447868559382,ISE6
 0,PR,2020,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,1.5,BOP
 0,PR,2020,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,1.5,EOP
 0,,2020,USD,L,RA,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,0,CH,,BBA,59.8752944598663,BOP
@@ -323,19 +323,19 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,399.6339294988556,OCI1
 0,NIC,2020,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-299.675549694236,OCI1
 0,PR,2020,USD,L,BEPA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,320,IR6
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-42.968113614296705,AM
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-82.02271122089925,AM
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,139.90849210284577,BOP
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-15,EA
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,82.02271122089925,EOP
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,42.9681136142967,EOP
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,0.08233273235018213,IA
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-0.08233273235018213,IFIE1
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,42.968113614296705,IR3
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,82.02271122089925,IR3
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-124.90849210284577,IR5
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,5.156552131440618,AM
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,9.843447868559382,AM
 0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-9.843447868559382,EOP
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,5.156552131440618,IR4
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-5.156552131440618,ISE6
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-5.156552131440618,EOP
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,9.843447868559382,IR4
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-9.843447868559382,ISE6
 0,,2020,USD,L,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,59.8752944598663,BOP
 0,,2020,USD,L,RA,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,-30,CF
@@ -388,13 +388,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-199.8169647494278,OCI1
 0,NIC,2020,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,149.837774847118,OCI1
 0,CDR,2020,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-0.11527160395201003,OCI1
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,24.228134693791258,AM
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,46.24958203305145,AM
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-70.43538016962212,BOP
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-46.249582033051446,EOP
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.228134693791258,EOP
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-0.04233655722058882,IA
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.04233655722058882,IFIE1
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,70.43538016962212,ISE10
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-24.228134693791258,ISE7
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-46.24958203305145,ISE7
 0,,2020,USD,L,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.93764722993315,BOP
 0,,2020,USD,C,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-29.93764722993315,BOP
 0,,2020,USD,L,RA,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,15,CF
@@ -482,13 +482,13 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI1
 0,NIC,2020,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI1
 0,CDR,2020,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0,OCI1
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,24.228134693791258,AM
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,46.24958203305145,AM
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-70.43538016962212,BOP
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-46.249582033051446,EOP
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-24.228134693791258,EOP
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-0.04233655722058882,IA
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.04233655722058882,IFIE1
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,70.43538016962212,ISE10
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-24.228134693791258,ISE7
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-46.24958203305145,ISE7
 0,,2020,USD,L,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-29.93764722993315,BOP
 0,,2020,USD,C,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-29.93764722993315,BOP
 0,,2020,USD,L,RA,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,15,CF
diff --git a/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv b/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv
index f9cba291..bef760f1 100644
--- a/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv
+++ b/full-ifrs17-template/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv
@@ -76,22 +76,22 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,0.3283233358608868,YCU
 0,NIC,2020,USD,C,BE,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,-0.22380254636726704,YCU
 0,PR,2020,USD,L,BEPA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,96,IR6
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-38.60249856533708,AM
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,82.02271122089925,BOP
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-87.43135554903122,CL
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-5.773636697753954,AM
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,42.9681136142967,BOP
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-87.43135554903121,CL
 0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-43.599999999999994,EA
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,18.374757965778002,EOP
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,0.09388697662967685,IA
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-0.09388697662967685,IFIE1
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,38.60249856533708,IR3
-0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,25.139341666413856,IR5
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,12.129509556366443,EOP
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,0.07437430623754743,IA
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-0.07437430623754743,IFIE1
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,5.773636697753954,IR3
+0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,25.13934166641384,IR5
 0,,2020,USD,,C,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,105.89201388261736,MC
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,16.831613508459697,AM
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,-9.843447868559382,BOP
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,6.500343986157867,AM
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,-5.156552131440618,BOP
 0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-8.011834360099684,EOP
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,16.831613508459697,IR4
-0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-16.831613508459697,ISE6
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-13.656208145282752,EOP
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,6.500343986157867,IR4
+0,,2020,USD,,DA,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-6.500343986157867,ISE6
 0,,2020,USD,,L,CHF,DT1.1,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,31.958738976731105,BOP
 0,,2020,USD,,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-87.43135554903124,CL
 0,,2020,USD,,L,CHF,DT1.1,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,0,EOP
@@ -251,22 +251,22 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,0.3283233358608868,YCU
 0,NIC,2020,USD,C,BE,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,-0.22380254636726704,YCU
 0,PR,2020,USD,L,BEPA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,120,IR6
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-34.26645281902704,AM
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,82.02271122089925,BOP
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-87.43135554903122,CL
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-3.7096824440639895,AM
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,42.9681136142967,BOP
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-87.43135554903121,CL
 0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-50,EA
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,16.31080371208803,EOP
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,0.09388697662967685,IA
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-0.09388697662967685,IFIE1
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,34.26645281902704,IR3
-0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,31.53934166641386,IR5
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,7.793463810056409,EOP
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,0.07437430623754743,IA
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-0.07437430623754743,IFIE1
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,3.7096824440639895,IR3
+0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,31.539341666413847,IR5
 0,,2020,USD,,C,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,105.89201388261736,MC
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,16.831613508459697,AM
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,-9.843447868559382,BOP
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,6.500343986157867,AM
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,I,Default,,DT1,0,CH,,BBA,-5.156552131440618,BOP
 0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-8.011834360099684,EOP
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,16.831613508459697,IR4
-0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-16.831613508459697,ISE6
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-13.656208145282752,EOP
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,6.500343986157867,IR4
+0,,2020,USD,,DA,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-6.500343986157867,ISE6
 0,,2020,USD,,L,CHF,DT1.3,P,False,LRC,ANN,N,Default,,DT1,0,CH,,BBA,31.958738976731105,BOP
 0,,2020,USD,,L,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,-87.43135554903122,CL
 0,,2020,USD,,L,CHF,DT1.3,P,False,LRC,ANN,C,Default,,DT1,0,CH,,BBA,0,EOP
@@ -375,22 +375,22 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,0.3283233358608868,YCU
 0,NIC,2020,USD,C,BE,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,-0.22380254636726704,YCU
 0,PR,2020,USD,L,BEPA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,96,IR6
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-38.60249856533708,AM
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,82.02271122089925,BOP
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-87.43135554903122,CL
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-5.773636697753954,AM
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,42.9681136142967,BOP
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-87.43135554903121,CL
 0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-43.599999999999994,EA
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,18.374757965778002,EOP
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,0.09388697662967685,IA
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-0.09388697662967685,IFIE1
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,38.60249856533708,IR3
-0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,25.139341666413856,IR5
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,12.129509556366443,EOP
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,0.07437430623754743,IA
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-0.07437430623754743,IFIE1
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,5.773636697753954,IR3
+0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,25.13934166641384,IR5
 0,,2020,USD,,C,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,105.89201388261736,MC
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,16.831613508459697,AM
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,-9.843447868559382,BOP
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,6.500343986157867,AM
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,I,,,DT2,0,CH,,BBA,-5.156552131440618,BOP
 0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-8.011834360099686,EOP
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,16.831613508459697,IR4
-0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-16.831613508459697,ISE6
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-13.65620814528275,EOP
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,6.500343986157867,IR4
+0,,2020,USD,,DA,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-6.500343986157867,ISE6
 0,,2020,USD,,L,CHF,DT2.1,P,False,LRC,ANN,N,,,DT2,0,CH,,BBA,31.958738976731105,BOP
 0,,2020,USD,,L,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,-87.43135554903122,CL
 0,,2020,USD,,L,CHF,DT2.1,P,False,LRC,ANN,C,,,DT2,0,CH,,BBA,0,EOP
@@ -554,29 +554,30 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,0.3283233358608868,YCU
 0,NIC,2020,USD,C,BE,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,-0.22380254636726704,YCU
 0,PR,2020,USD,L,BEPA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,96,IR6
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-51.96181825867143,AM
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,129.49726655304642,BOP
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,67.83795828214957,BOP
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-139.94506864907146,CL
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-43.599999999999994,EA
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-33.87170342894083,EA
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,0,EOP
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,0.11760647207910604,IA
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-0.11760647207910604,IFIE1
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,51.96181825867143,IR3
-0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,77.65305476645409,IR5
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,0.08679991324534386,IA
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-0.08679991324534386,IFIE1
+0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,67.92475819539493,IR5
 0,,2020,USD,,C,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,105.89201388261736,MC
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,24.84344786855938,AM
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,-9.843447868559382,BOP
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,20.15655213144062,AM
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,-5.156552131440618,BOP
 0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-15,CF
 0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,0,EOP
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,24.84344786855938,IR4
-0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-24.84344786855938,ISE6
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,20.15655213144062,IR4
+0,,2020,USD,,DA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-20.15655213144062,ISE6
+0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-9.728296571059161,AM
 0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,0,CH,,BBA,31.958738976731105,BOP
 0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-87.43135554903122,CL
+0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,9.728296571059161,EA
 0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,0,EOP
 0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,0,CH,,BBA,55.45631603430072,EV
 0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,N,Default,,DT3,0,CH,,BBA,0.016300537999407044,IA
 0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-0.016300537999407044,IFIE1
-0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,0.016300537999399012,ISE11
+0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,-9.71199603305977,ISE11
+0,,2020,USD,,L,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,9.728296571059161,ISE9
 0,PR,2020,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,I,Default,,DT3,0,CH,,BBA,1.5,BOP
 0,PR,2020,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,3,CF
 0,PR,2020,USD,,OA,CHF,DT3.1,P,False,LRC,ANN,C,Default,,DT3,0,CH,,BBA,2.5,EOP
@@ -684,24 +685,24 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,0.3283233358608868,YCU
 0,NIC,2020,USD,C,BE,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,-0.22380254636726704,YCU
 0,PR,2020,USD,L,BEPA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,104,IR6
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-96.83022811966929,AM
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,82.02271122089925,BOP
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-33.48998867550812,AM
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,42.9681136142967,BOP
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,8.004653973154419,BOP
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-51.599999999999994,EA
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,46.09110994353215,EOP
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,70.35723911069861,EOP
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,-1.4922636208166304,EV
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,0.09388697662967685,IA
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,0.07437430623754743,IA
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,N,Default,,DT4,0,CH,,BBA,0.0003356307173485902,IA
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-0.09422260734702544,IFIE1
-0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,96.83022811966929,IR3
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-0.07470993695489601,IFIE1
+0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,33.48998867550812,IR3
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-60.80440423495516,IR5
 0,,2020,USD,,C,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,105.89201388261736,MC
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,16.831613508459697,AM
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,-9.843447868559382,BOP
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,6.500343986157867,AM
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,-5.156552131440618,BOP
 0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-15,CF
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-8.011834360099684,EOP
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,16.831613508459697,IR4
-0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-16.831613508459697,ISE6
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-13.656208145282752,EOP
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,6.500343986157867,IR4
+0,,2020,USD,,DA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-6.500343986157867,ISE6
 0,PR,2020,USD,,OA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,3,CF
 0,PR,2020,USD,,OA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,1,EOP
 0,PR,2020,USD,,OA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,3,IR1
@@ -730,8 +731,8 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,,2020,USD,L,RA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,-7.486276372201601,OCI1
 0,,2020,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,C,Default,,DT4,0,CH,,BBA,7.5142516904975025,OCI1
 0,,2020,USD,C,RA,CHF,DT4.1,P,False,LRC,ANN,I,Default,,DT4,0,CH,,BBA,-0.02238025463672244,YCU
-0,PR,2020,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45,CF
 0,NIC,2020,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,35,CF
+0,PR,2020,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45,CF
 0,PR,2020,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-45,ISE1
 0,NIC,2020,USD,,A,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,35,ISE2
 0,PR,2020,USD,,AA,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,2,CF
@@ -808,15 +809,15 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.1641616679304434,YCU
 0,NIC,2020,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,0.11190127318363352,YCU
 0,CDR,2020,USD,C,BE,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-8.349412781047394E-05,YCU
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,38.316584766326955,AM
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-46.24958203305145,BOP
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,11.133355649364928,AM
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-24.22813469379126,BOP
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26014863442721,CL
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.5933128558860402,CRU
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-18.238663229656325,EOP
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.04954912095471157,IA
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.6428619768407517,IFIE1
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-23.389442532110124,EOP
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-0.03854664570667637,IA
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,0.6318595015927165,IFIE1
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,9.662803986091077,ISE10
-0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-38.316584766326955,ISE7
+0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,-11.133355649364928,ISE7
 0,,2020,USD,,C,CHF,DTR1.1,P,True,LRC,ANN,I,Default,PT1,DTR1,0,CH,,BBA,-52.92295262051829,MC
 0,,2020,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,N,Default,PT1,DTR1,0,CH,,BBA,-15.684995728561214,BOP
 0,,2020,USD,,LR,CHF,DTR1.1,P,True,LRC,ANN,C,Default,PT1,DTR1,0,CH,,BBA,43.26014863442721,CL
@@ -999,15 +1000,15 @@ AccidentYear,AmountType,AnnualCohort,ContractualCurrency,EconomicBasis,EstimateT
 0,PR,2020,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.1641616679304434,YCU
 0,NIC,2020,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,0.11190127318363352,YCU
 0,CDR,2020,USD,C,BE,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-8.349412781047394E-05,YCU
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,38.316584766326955,AM
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-46.24958203305145,BOP
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,11.133355649364928,AM
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-24.22813469379126,BOP
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,43.26014863442721,CL
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.5933128558860402,CRU
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-18.238663229656325,EOP
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.04954912095471157,IA
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.6428619768407517,IFIE1
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-23.389442532110124,EOP
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-0.03854664570667637,IA
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,0.6318595015927165,IFIE1
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,9.662803986091077,ISE10
-0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-38.316584766326955,ISE7
+0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,-11.133355649364928,ISE7
 0,,2020,USD,,C,CHF,DTR2.1,P,True,LRC,ANN,I,,PT1,DTR2,0,CH,,BBA,-52.92295262051829,MC
 0,,2020,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,N,,PT1,DTR2,0,CH,,BBA,-15.684995728561214,BOP
 0,,2020,USD,,LR,CHF,DTR2.1,P,True,LRC,ANN,C,,PT1,DTR2,0,CH,,BBA,43.26014863442721,CL
diff --git a/full-ifrs17-template/Test/IfrsVariablesTest.ipynb b/full-ifrs17-template/Test/IfrsVariablesTest.ipynb
index 1a40358a..98187848 100644
--- a/full-ifrs17-template/Test/IfrsVariablesTest.ipynb
+++ b/full-ifrs17-template/Test/IfrsVariablesTest.ipynb
@@ -211,9 +211,13 @@
         {
             "cell_type": "code",
             "source": [
-                "var errorList = new List<BenchmarkTestResult>();",
-                "\n",
-                "\nforeach (var g in bmFiles.GroupBy(x => (ReportingNode: x.ReportingNode, Year: x.Year, Month: x.Month)))",
+                "var errorList = new List<BenchmarkTestResult>();"
+            ]
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "foreach (var g in bmFiles.GroupBy(x => (ReportingNode: x.ReportingNode, Year: x.Year, Month: x.Month)))",
                 "\n{",
                 "\n    var reportingNode = g.Key.ReportingNode;",
                 "\n    var year = g.Key.Year;",
@@ -235,7 +239,7 @@
                 "\n        var extension = System.IO.Path.GetExtension(bmfile.FileName);",
                 "\n        var stream = await Project.FileStorage.ReadAsync(bmfile.FileName);",
                 "\n        //Read Bm csv",
-                "\n        var bmDataTable = (await DataSetReader.ReadFromStream(stream).WithContentType(extension).ExecuteAsync());",
+                "\n        var bmDataTable = (await DataSetReader.ReadFromStream(stream).WithContentType(extension).ExecuteAsync()).DataSet;",
                 "\n",
                 "\n        var mainTab = bmDataTable.Tables[Main].Rows.First();",
                 "\n        if(!ValidateMainTab(mainTab, reportingNode, year, month))",
@@ -247,8 +251,10 @@
                 "\n        //Get the computed Data",
                 "\n        var computedVariables = computedVariablesByEstimateType.TryGetValue(bmTableName, out var ret) ? ret : Enumerable.Empty<IfrsVariable>();",
                 "\n            ",
+                "\n        if(!computedVariables.Any())    ",
+                "\n            errorList.Add(new BenchmarkTestResult(\"No variables are computed for EstimateType: \" + bmTableName, 0, 0));",
                 "\n        //CompareAgainstBm",
-                "\n        if (bmVariables.Any() || computedVariables.Any()) //TODO we are adding duplicates here",
+                "\n        if (bmVariables.Any() && computedVariables.Any()) //TODO we are adding duplicates here",
                 "\n            errorList = errorList.Concat(CompareAgainstBm(errorList, bmVariables, computedVariables)).ToList();",
                 "\n    }",
                 "\n}",
diff --git a/full-ifrs17-template/Test/QueriesTest.ipynb b/full-ifrs17-template/Test/QueriesTest.ipynb
index ab6ca4d9..8fdabb4a 100644
--- a/full-ifrs17-template/Test/QueriesTest.ipynb
+++ b/full-ifrs17-template/Test/QueriesTest.ipynb
@@ -20,7 +20,7 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"../CalculationEngine\""
+                "#!import \"//ifrs17ce/dev/CalculationEngine\""
             ]
         },
         {
@@ -168,12 +168,13 @@
             "source": [
                 "public async Task CheckLoadDataNodeStateAsync(Args args, IEnumerable<DataNodeState> testData, bool isExpectedToBeActive)",
                 "\n{",
+                "\n    await Workspace.Partition.SetAsync<PartitionByReportingNode>(args);",
                 "\n    await Workspace.UpdateAsync(testData);",
                 "\n    var isActive = (await Workspace.LoadDataNodeStateAsync(args)).Keys.Contains(gic);",
                 "\n    ",
                 "\n    isActive.Should().Be(isExpectedToBeActive);",
                 "\n    ",
-                "\n    await Workspace.DeleteAsync(Workspace.Query<DataNodeState>().ToArray());",
+                "\n    Workspace.Reset(x => x.ResetCurrentPartitions());",
                 "\n}"
             ]
         },
@@ -210,6 +211,7 @@
                 "\n                                           double expectedCurrentFirstYcValue,",
                 "\n                                           double expectedLockedFirstYcValue)",
                 "\n{",
+                "\n    await Workspace.Partition.SetAsync<PartitionByReportingNode>(args);",
                 "\n    await Workspace.UpdateAsync(testData);",
                 "\n    await Workspace.UpdateAsync<ReportingNode>(new ReportingNode[]{new ReportingNode{Currency=\"EUR\",SystemName=\"CH\"}});",
                 "\n    ",
@@ -217,8 +219,7 @@
                 "\n    var eurLockedYieldCurve = (await LoadLockedInYieldCurveAsync(Workspace, args, dataNodes));",
                 "\n    var eurCurrentYieldCurve = (await LoadCurrentYieldCurveAsync(Workspace, args, dataNodes));",
                 "\n    ",
-                "\n    await Workspace.DeleteAsync(Workspace.Query<YieldCurve>().ToArray());",
-                "\n    await Workspace.DeleteAsync(Workspace.Query<ReportingNode>().ToArray());",
+                "\n    Workspace.Reset(x => x.ResetCurrentPartitions());",
                 "\n    ",
                 "\n    var errors = new List<string>();",
                 "\n    var currentPrevPeriod = eurCurrentYieldCurve[\"EUR\"][PreviousPeriod].Values.First();",
@@ -271,6 +272,7 @@
                 "\n                                                       int? currentYear = null)",
                 "\n{",
                 "\n    currentYear = currentYear ?? previousYear;",
+                "\n    await Workspace.Partition.SetAsync<PartitionByReportingNode>(args);",
                 "\n    await Workspace.UpdateAsync(testData);",
                 "\n        ",
                 "\n    var interDataNodeParameters = await LoadInterDataNodeParametersAsync(Workspace, args);",
@@ -345,7 +347,7 @@
                 "\n        }",
                 "\n    }",
                 "\n    ",
-                "\n    await Workspace.DeleteAsync(Workspace.Query<InterDataNodeParameter>().ToArray());",
+                "\n    Workspace.Reset(x => x.ResetCurrentPartitions());",
                 "\n   ",
                 "\n    if(errors.Any()) ApplicationMessage.Log(Error.Generic, string.Join(\"\\n\", errors));",
                 "\n}"
diff --git a/full-ifrs17-template/Test/SpecificationsImportCashflows.ipynb b/full-ifrs17-template/Test/SpecificationsImportCashflows.ipynb
index 7831cbde..4be8de77 100644
--- a/full-ifrs17-template/Test/SpecificationsImportCashflows.ipynb
+++ b/full-ifrs17-template/Test/SpecificationsImportCashflows.ipynb
@@ -1824,7 +1824,7 @@
                 "\nwhile the AMF related to the current period is",
                 "\n",
                 "\n$$",
-                "\n\\text{AMF} = \\prod _{t = \\text{S}}^{\\text{S}+\\text{TS}} \\text{AMF}^{\\text{Monthly}}_t  ~.",
+                "\n\\text{AMF} = 1 - \\prod _{t = \\text{S}}^{\\text{S}+\\text{TS}-1} \\text{AMF}^{\\text{Monthly}}_t  ~.",
                 "\n$$",
                 "\n",
                 "\nwhere the shift S and Time Step TS for the [current period](#year-and-period) are"
@@ -1949,7 +1949,7 @@
         {
             "cell_type": "code",
             "source": [
-                "var expectedCurrentPeriodAmortizationFactor = expectedMonthlyAmortizationFactor.Skip(shift).Take(timeStep).Aggregate(1d, (x, y) => x * y);"
+                "var expectedCurrentPeriodAmortizationFactor = 1d - expectedMonthlyAmortizationFactor.Skip(shift).Take(timeStep).Aggregate(1d, (x, y) => x * y);"
             ]
         },
         {
diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index 98114494..f5fcf571 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -43,16 +43,16 @@
         {
             "cell_type": "code",
             "source": [
-                "#r \"nuget:Systemorph.Workspace,1.2.0\"",
-                "\n#r \"nuget:Systemorph.Scopes,1.2.4\"",
-                "\n#r \"nuget:Systemorph.Import,1.3.0\"",
-                "\n#r \"nuget:Systemorph.Test,1.2.4\"",
-                "\n#r \"nuget:Systemorph.Export,1.3.0\"",
-                "\n#r \"nuget:Systemorph.DataSetReader,1.3.0\"",
-                "\n#r \"nuget:Systemorph.DataSource,1.2.0\"",
-                "\n#r \"nuget:Systemorph.DataSource.Conversions,1.2.0\"",
-                "\n#r \"nuget:Systemorph.Reporting,1.2.4\"",
-                "\n#r \"nuget:Systemorph.DomainDesigner,1.3.0\""
+                "#r \"nuget:Systemorph.Workspace,1.4.1\"",
+                "\n#r \"nuget:Systemorph.Scopes,1.4.0\"",
+                "\n#r \"nuget:Systemorph.Import,1.4.0\"",
+                "\n#r \"nuget:Systemorph.Test,1.4.0\"",
+                "\n#r \"nuget:Systemorph.Export,1.4.0\"",
+                "\n#r \"nuget:Systemorph.DataSetReader,1.4.0\"",
+                "\n#r \"nuget:Systemorph.DataSource,1.4.1\"",
+                "\n#r \"nuget:Systemorph.DataSource.Conversions,1.4.1\"",
+                "\n#r \"nuget:Systemorph.Reporting,1.4.0\"",
+                "\n#r \"nuget:Systemorph.DomainDesigner,1.4.0\""
             ]
         },
         {
diff --git a/ifrs17/Import/ImportScopeCalculation.ipynb b/ifrs17/Import/ImportScopeCalculation.ipynb
index 803483c1..ee63b100 100644
--- a/ifrs17/Import/ImportScopeCalculation.ipynb
+++ b/ifrs17/Import/ImportScopeCalculation.ipynb
@@ -1055,10 +1055,12 @@
                 "For a certain projection period - defined by the Shift, $S$, and the Time-Step, $TS$, parameters - the Amortization Factor is then given by the product of the corresponding monthly amortization factors:",
                 "\n",
                 "\n$$",
-                "\nAF = \\prod _{i = S}^{TS} \\text{Monthly }AF_i ~.",
+                "\nAF = 1 - \\prod _{i = S}^{S + TS - 1} \\text{Monthly }AF_i ~.",
                 "\n$$",
                 "\n",
-                "\nEach GIC will have his own AF."
+                "\nEach GIC will have his own AF.",
+                "\n",
+                "\nIn order to run off the business of a given Group of Contract one should provide a cashflow of 0s for the AocStep with AocType CL and Novelty C. When computing the AF this results in the product of the monthly amortization factors of the period to be 1. In this case, the computed AF does not follow the formula above but is 1 allowing for the full release of the Technical Margin in the AM AocStep."
             ]
         },
         {
@@ -1073,15 +1075,17 @@
                 "\n                                                            ",
                 "\n    private int shift => GetStorage().GetShift(0);//Identity.ProjectionPeriod",
                 "\n    private int timeStep => GetStorage().GetTimeStep(0);//Identity.ProjectionPeriod",
-                "\n    ",
-                "\n    [NotVisible] string EconomicBasis => GetContext();",
-                "\n    ",
-                "\n    string EstimateType => EstimateTypes.F;",
-                "\n    double Value => GetScope<MonthlyAmortizationFactorCashflow>(Identity)",
+                "\n    private double amortizedFactor => GetScope<MonthlyAmortizationFactorCashflow>(Identity)",
                 "\n                            .MonthlyAmortizationFactors",
                 "\n                            .Skip(shift)",
                 "\n                            .Take(timeStep)",
                 "\n                            .Aggregate(1d, (x, y) => x * y);",
+                "\n    [NotVisible] string EconomicBasis => GetContext();",
+                "\n    ",
+                "\n    string EstimateType => EstimateTypes.F;",
+                "\n    double Value => Math.Abs(amortizedFactor - 1d) > Precision",
+                "\n                        ? 1d - amortizedFactor",
+                "\n                        : 1d;",
                 "\n}",
                 "\n",
                 "\npublic interface AmfFromIfrsVariable : CurrentPeriodAmortizationFactor",
diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index 34ab4202..4b2d2a5a 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -273,7 +273,7 @@
                 "\n",
                 "\n    var extension = System.IO.Path.GetExtension(file);",
                 "\n    var stream = await Project.FileStorage.ReadAsync(file);",
-                "\n    var target = (await DataSetReader.ReadFromStream(stream).WithContentType(extension).ExecuteAsync()).Tables[tab];",
+                "\n    var target = (await DataSetReader.ReadFromStream(stream).WithContentType(extension).ExecuteAsync()).DataSet.Tables[tab];",
                 "\n                ",
                 "\n",
                 "\n    var dataNodesImported = target.Rows.Select(x => x.Field<string>(nameof(RawVariable.DataNode))).ToHashSet();",
@@ -332,7 +332,7 @@
                 "\n{",
                 "\n    var extension = System.IO.Path.GetExtension(file);",
                 "\n    var stream = await Project.FileStorage.ReadAsync(file);",
-                "\n    var mainTab = (await DataSetReader.ReadFromStream(stream).WithContentType(extension).ExecuteAsync()).Tables[Main];",
+                "\n    var mainTab = (await DataSetReader.ReadFromStream(stream).WithContentType(extension).ExecuteAsync()).DataSet.Tables[Main];",
                 "\n    ",
                 "\n    if(mainTab == null) ApplicationMessage.Log(Error.NoMainTab);",
                 "\n    if(mainTab.Rows.Count() == 0) ApplicationMessage.Log(Error.IncompleteMainTab);",
diff --git a/ifrs17/Utils/ApplicationMessage.ipynb b/ifrs17/Utils/ApplicationMessage.ipynb
index 2bc8ec97..d5b26c8b 100644
--- a/ifrs17/Utils/ApplicationMessage.ipynb
+++ b/ifrs17/Utils/ApplicationMessage.ipynb
@@ -27,7 +27,7 @@
         {
             "cell_type": "code",
             "source": [
-                "#r \"nuget:Systemorph.Activities,1.2.3\""
+                "#r \"nuget:Systemorph.Activities,1.4.0\""
             ]
         },
         {