diff --git a/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb b/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb
index 8eeca40e..1701101f 100644
--- a/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb
+++ b/ifrs17-template/Database/MigrationAndScaffolding/Initial.ipynb
@@ -37,7 +37,7 @@
         {
             "cell_type": "code",
             "source": [
-                "[Migration(\"20230517120004_InitialTypes\")]",
+                "[Migration(\"20230523120744_InitialTypes\")]",
                 "\npublic class InitialTypes : Migration",
                 "\n{",
                 "\n    protected override void Up(MigrationBuilder migrationBuilder)",
@@ -162,7 +162,9 @@
                 "\n                ReinsuranceCoverage = table.Column<double>(type: \"float\", nullable: true),",
                 "\n                PremiumAllocation = table.Column<double>(type: \"float\", nullable: true),",
                 "\n                CashFlowPeriodicity = table.Column<int>(type: \"int\", nullable: true),",
-                "\n                InterpolationMethod = table.Column<int>(type: \"int\", nullable: true)",
+                "\n                InterpolationMethod = table.Column<int>(type: \"int\", nullable: true),",
+                "\n                EconomicBasisDriver = table.Column<string>(type: \"nvarchar(max)\", nullable: true),",
+                "\n                ReleasePattern = table.Column<byte[]>(type: \"varbinary(max)\", nullable: true)",
                 "\n            },",
                 "\n            constraints: table =>",
                 "\n            {",
diff --git a/ifrs17-template/Files/Dimensions.csv b/ifrs17-template/Files/Dimensions.csv
index 6341704f..08ff8494 100644
--- a/ifrs17-template/Files/Dimensions.csv
+++ b/ifrs17-template/Files/Dimensions.csv
@@ -15,6 +15,7 @@ NE,Non Attributable Expenses,,110,BeginningOfPeriod,,,,,,,
 AC,Attributable Commission,,120,BeginningOfPeriod,,,,,,,
 ACA,Aquisition,AC,130,BeginningOfPeriod,,,,,,,
 ACM,Maitenance,AC,140,EndOfPeriod,,,,,,,
+CU,Coverage Units,,150,EndOfPeriod,,,,,,,
 ,,,,,,,,,,,
 @@DeferrableAmountType,,,,,,,,,,,
 SystemName,DisplayName,Parent,Order,PeriodType,,,,,,,
@@ -114,7 +115,7 @@ C,Current,20,,,,,,,,,
 SystemName,DisplayName,Order,StructureType,InputSource,PeriodType,,,,,,
 BE,Best Estimate of Present Value,1,AoC,4,EndOfPeriod,,,,,,
 RA,Risk Adjustment,10,AoC,4,EndOfPeriod,,,,,,
-CU,CoverageUnit,15,AoC,4,EndOfPeriod,,,,,,
+P,Patterns,15,AoC,4,EndOfPeriod,,,,,,
 C,Contractual Service Margin,20,AoC,7,NotApplicable,,,,,,
 L,Loss Component,30,AoC,7,NotApplicable,,,,,,
 LR,Loss Recovery Component,40,AoC,7,NotApplicable,,,,,,
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv
index fc7e76c9..19b59a59 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12.csv
@@ -5,113 +5,113 @@ CH,2020,12,,,,,,,,,,,,,,,,,,,,,,,,,,,
 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,,CU,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,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,,CU,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,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.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,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,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
 DT1.2,NIC,BE,CL,C,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,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,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,,CU,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,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,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,,CU,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,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
 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,,CU,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,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,,CU,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,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
-DT2.2,,CU,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
+DT2.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
 DT2.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
 DT2.2,NIC,BE,CL,C,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
-DT2.2,,CU,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
+DT2.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
 DT2.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
 DTR1.1,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
 DTR1.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
-DTR1.1,,CU,BOP,N,,-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.1,CU,P,BOP,N,,-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.1,,RA,BOP,N,,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
 DTR1.1,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,0
 DTR1.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
-DTR1.1,,CU,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.1,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.1,,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
 DTR1.2,NIC,BE,BOP,N,2020,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,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.2,,CU,BOP,N,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
+DTR1.2,CU,P,BOP,N,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
 DTR1.2,,RA,BOP,N,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
 DTR1.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,12.5,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.2,,CU,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
+DTR1.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
 DTR1.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
 DTR2.1,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
 DTR2.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
-DTR2.1,,CU,BOP,N,,-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.1,CU,P,BOP,N,,-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.1,,RA,BOP,N,,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
 DTR2.1,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,0
 DTR2.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
-DTR2.1,,CU,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
+DTR2.1,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
 DTR2.1,,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
 DTR2.2,NIC,BE,BOP,N,2020,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5
-DTR2.2,,CU,BOP,N,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,CU,P,BOP,N,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,BOP,N,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
 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,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5
-DTR2.2,,CU,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,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,,CU,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,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,,CU,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,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,,CU,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,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,,CU,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,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,,CU,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,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,,CU,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,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,,CU,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,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,,CU,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,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
 DTR1.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
-DTR1.3,,CU,BOP,N,,-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.3,CU,P,BOP,N,,-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.3,,RA,BOP,N,,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
 DTR1.3,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,0
 DTR1.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
-DTR1.3,,CU,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.3,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.3,,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
 DTR1.4,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
 DTR1.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
-DTR1.4,,CU,BOP,N,,-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,CU,P,BOP,N,,-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,BOP,N,,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
 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,0
 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,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,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
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12_Projection.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12_Projection.csv
index 11a03541..59d27636 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12_Projection.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2020_12_Projection.csv
@@ -5,9 +5,9 @@ CH,2020,12,,,,,,,,,,,,,,,,,,,,,,,,,,,
 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
 DTP1.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
 DTP1.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
-DTP1.1,,CU,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
+DTP1.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
 DTP1.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
 DTP1.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
 DTP1.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
-DTP1.1,,CU,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
+DTP1.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
 DTP1.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
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv
index b814f614..8975012d 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3.csv
@@ -5,7 +5,7 @@ CH,2021,3,,,,,,,,,,,,,,,,,,,,,,,,
 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,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,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
@@ -18,21 +18,21 @@ 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,
 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,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,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
-DT1.2,,CU,MC,I,2020,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
+DT1.2,CU,P,MC,I,2020,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT1.2,,RA,MC,I,2020,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT1.2,NIC,BE,BOP,N,2020,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,0,0,0,0,0,0,0,0,0
 DT1.2,,RA,BOP,N,2020,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT1.2,NIC,BE,EV,N,2020,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,0,0,0,0,0,0,0,0,0
 DT1.2,,RA,EV,N,2020,-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.2,NIC,BE,CL,C,2020,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,0,0,0,0,0,0,0,0,0
-DT1.2,,CU,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,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,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,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
@@ -45,11 +45,11 @@ 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,
 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,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,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,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,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
@@ -62,21 +62,21 @@ 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,
 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,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,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
-DT2.2,,CU,MC,I,2020,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
+DT2.2,CU,P,MC,I,2020,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,0,0,0,0,0,0,0,0,0
 DT2.2,,RA,MC,I,2020,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,0,0,0,0,0,0,0,0,0
 DT2.2,NIC,BE,BOP,N,2020,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,0,0,0,0,0,0,0,0,0
 DT2.2,,RA,BOP,N,2020,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0
 DT2.2,NIC,BE,EV,N,2020,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,0,0,0,0,0,0,0,0,0
 DT2.2,,RA,EV,N,2020,-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.2,NIC,BE,CL,C,2020,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,-30,0,0,0,0,0,0,0,0,0
-DT2.2,,CU,CL,C,2020,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,0,0,0,0,0,0,0,0,0
+DT2.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
 DT2.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
 DTR1.1,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
 DTR1.1,NIC,BE,MC,I,,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0
-DTR1.1,,CU,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
+DTR1.1,CU,P,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
 DTR1.1,,RA,MC,I,,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0
 DTR1.1,PR,BE,BOP,N,,0,-5,0,0,-5,0,0,-5,0,0,-5,0,0,0,0,0,0,0,0,0,0
 DTR1.1,NIC,BE,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,0,0,0,0,0,0,0,0,0
@@ -86,21 +86,21 @@ DTR1.1,NIC,BE,EV,N,,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0
 DTR1.1,,RA,EV,N,,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0,0,0,0,0,0,0,0,0
 DTR1.1,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.1,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.1,,CU,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.1,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.1,,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
 DTR1.2,NIC,BE,MC,I,2020,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0
-DTR1.2,,CU,MC,I,2020,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
+DTR1.2,CU,P,MC,I,2020,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
 DTR1.2,,RA,MC,I,2020,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0
 DTR1.2,NIC,BE,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,0,0,0,0,0,0,0,0,0
 DTR1.2,,RA,BOP,N,2020,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
 DTR1.2,NIC,BE,EV,N,2020,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0
 DTR1.2,,RA,EV,N,2020,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0,0,0,0,0,0,0,0,0
 DTR1.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
-DTR1.2,,CU,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
+DTR1.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
 DTR1.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
 DTR2.1,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
 DTR2.1,NIC,BE,MC,I,,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0
-DTR2.1,,CU,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
+DTR2.1,CU,P,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
 DTR2.1,,RA,MC,I,,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0
 DTR2.1,PR,BE,BOP,N,,0,-5,0,0,-5,0,0,-5,0,0,-5,0,0,0,0,0,0,0,0,0,0
 DTR2.1,NIC,BE,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,0,0,0,0,0,0,0,0,0
@@ -110,21 +110,21 @@ DTR2.1,NIC,BE,EV,N,,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0
 DTR2.1,,RA,EV,N,,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0,0,0,0,0,0,0,0,0
 DTR2.1,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
 DTR2.1,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
-DTR2.1,,CU,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
+DTR2.1,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
 DTR2.1,,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
 DTR2.2,NIC,BE,MC,I,2020,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0
-DTR2.2,,CU,MC,I,2020,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
+DTR2.2,CU,P,MC,I,2020,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
 DTR2.2,,RA,MC,I,2020,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0
 DTR2.2,NIC,BE,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,0,0,0,0,0,0,0,0,0
 DTR2.2,,RA,BOP,N,2020,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
 DTR2.2,NIC,BE,EV,N,2020,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0
 DTR2.2,,RA,EV,N,2020,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0,0,0,0,0,0,0,0,0
 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,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,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,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,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
@@ -137,11 +137,11 @@ 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,
 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,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,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,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
@@ -154,11 +154,11 @@ 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,
 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,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,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,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,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
@@ -171,11 +171,11 @@ 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,
 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,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,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,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,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
@@ -188,11 +188,11 @@ 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,
 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,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,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
 DTR1.3,NIC,BE,MC,I,,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0
-DTR1.3,,CU,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
+DTR1.3,CU,P,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
 DTR1.3,,RA,MC,I,,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0
 DTR1.3,PR,BE,BOP,N,,0,-5,0,0,-5,0,0,-5,0,0,-5,0,0,0,0,0,0,0,0,0,0
 DTR1.3,NIC,BE,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,0,0,0,0,0,0,0,0,0
@@ -202,11 +202,11 @@ DTR1.3,NIC,BE,EV,N,,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0
 DTR1.3,,RA,EV,N,,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0,0,0,0,0,0,0,0,0
 DTR1.3,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.3,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.3,,CU,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.3,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.3,,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
 DTR1.4,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
 DTR1.4,NIC,BE,MC,I,,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0
-DTR1.4,,CU,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
+DTR1.4,CU,P,MC,I,,-5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-1.5,0,0,0,0,0,0,0,0,0
 DTR1.4,,RA,MC,I,,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0
 DTR1.4,PR,BE,BOP,N,,0,-5,0,0,-5,0,0,-5,0,0,-5,0,0,0,0,0,0,0,0,0,0
 DTR1.4,NIC,BE,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,0,0,0,0,0,0,0,0,0
@@ -216,5 +216,5 @@ DTR1.4,NIC,BE,EV,N,,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0
 DTR1.4,,RA,EV,N,,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0.25,0,0,0,0,0,0,0,0,0
 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,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,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
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3_Projection.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3_Projection.csv
index 5056a3e4..05e41d33 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3_Projection.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_CH_2021_3_Projection.csv
@@ -5,7 +5,7 @@ CH,2021,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 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,Values24,Values25,Values26,Values27,Values28,Values29,Values30,Values31,Values32,Values33,Values34,Values35,Values36,Values37,Values38,Values39,Values40,Values41,Values42,Values43,Values44,Values45,Values46,Values47,Values48,Values49,Values50,Values51,Values52,Values53,Values54,Values55,Values56,Values57,Values58,Values59,Values60,Values61,Values62,Values63,Values64,Values65,Values66,Values67,Values68,Values69,Values70,Values71,Values72,Values73,Values74,Values75,Values76,Values77,Values78,Values79,Values80,Values81,Values82,Values83,Values84,Values85,Values86,Values87,Values88,Values89,Values90,Values91,Values92,Values93,Values94,Values95,Values96,Values97,Values98,Values99,Values100,Values101,Values102,Values103,Values104,Values105,Values106,Values107,Values108,Values109,Values110,Values111,Values112,Values113,Values114,Values115,Values116,Values117,Values118,Values119,Values120,Values121,Values122,Values123,Values124,Values125,Values126,Values127,Values128,Values129,Values130,Values131,Values132,Values133,Values134,Values135,Values136,Values137,Values138,Values139,Values140,Values141,Values142,Values143,Values144,Values145,Values146,Values147,Values148,Values149,Values150,Values151,Values152,Values153,Values154,Values155,Values156,Values157,Values158,Values159,Values160,Values161,Values162,Values163,Values164,Values165,Values166,Values167,Values168,Values169,Values170,Values171,Values172,Values173,Values174,Values175,Values176,Values177,Values178,Values179,Values180,Values181,Values182,Values183,Values184,Values185,Values186,Values187,Values188,Values189,Values190,Values191,Values192,Values193,Values194,Values195,Values196,Values197,Values198,Values199,Values200,Values201,Values202,Values203,Values204,Values205,Values206,Values207,Values208,Values209,Values210,Values211,Values212,Values213,Values214,Values215,Values216,Values217,Values218,Values219,Values220,Values221,Values222,Values223,Values224,Values225,Values226,Values227
 DTP1.1,PR,BE,MC,I,,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0,0,110,0
 DTP1.1,NIC,BE,MC,I,,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20
-DTP1.1,,CU,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
+DTP1.1,CU,P,MC,I,,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3
 DTP1.1,,RA,MC,I,,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2
 DTP1.1,PR,BE,BOP,N,,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0,0,10,0
 DTP1.1,NIC,BE,BOP,N,,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4
@@ -15,5 +15,5 @@ DTP1.1,NIC,BE,EV,N,,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,
 DTP1.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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-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.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5
 DTP1.1,PR,BE,CL,C,,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0,0,115,0
 DTP1.1,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29
-DTP1.1,,CU,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5
+DTP1.1,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5
 DTP1.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,-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,-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,-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,-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,-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,-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,-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,-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,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_ES_2020_12.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_ES_2020_12.csv
index dacb3e3f..d63fc003 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_ES_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_ES_2020_12.csv
@@ -11,4 +11,4 @@ DataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Va
 3BBBA.0,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,
 3BBBA.0,AEM,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,
 3BBBA.0,AEA,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,
-3BBBA.0,,CU,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,,,,,,,,,,,,,
+3BBBA.0,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv b/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv
index 662e8b2f..c0ac6474 100644
--- a/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv
+++ b/ifrs17-template/Files/TransactionalData/NominalCashflows_FR_2020_12.csv
@@ -8,52 +8,52 @@ EY52BBA.1,NIC,BE,BOP,N,,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,
 EY52BBA.1,NIC,BE,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667
 EY52BBA.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,0,0,0
 EY52BBA.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667,-79.16666667
-EY52BBA.1,,CU,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
+EY52BBA.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
 EY57G.1,PR,BE,BOP,N,,1000,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY57G.1,NIC,BE,BOP,N,,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,-75,,,,,,,,,,,,
 EY57G.1,,RA,BOP,N,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,,,,,,,,,,,,
 EY57G.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY57G.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY57G.1,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
-EY57G.1,,CU,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
+EY57G.1,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
 EY57R.1,PR,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,,,,,,,,,,,,
 EY57R.1,NIC,BE,BOP,N,,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,,,,,,,,,,,,
 EY57R.1,,RA,BOP,N,,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,,,,,,,,,,,,
 EY57R.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY57R.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY57R.1,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
-EY57R.1,,CU,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
+EY57R.1,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
 EY58G.1,PR,BE,BOP,N,,75,75,75,75,75,75,75,75,75,75,75,75,,,,,,,,,,,,
 EY58G.1,NIC,BE,BOP,N,,-50,-50,-50,-50,-50,-50,-50,-50,-50,-50,-50,-50,,,,,,,,,,,,
 EY58G.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY58G.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
-EY58G.1,,CU,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
+EY58G.1,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
 EY58G.2,PR,BE,BOP,N,,17.5,17.5,17.5,17.5,17.5,17.5,17.5,17.5,17.5,17.5,17.5,17.5,,,,,,,,,,,,
 EY58G.2,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,,,,,,,,,,,,
 EY58G.2,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY58G.2,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
-EY58G.2,,CU,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
+EY58G.2,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
 EY58R.1,PR,BE,BOP,N,,-26.25,-26.25,-26.25,-26.25,-26.25,-26.25,-26.25,-26.25,-26.25,-26.25,-26.25,-26.25,,,,,,,,,,,,
 EY58R.1,NIC,BE,BOP,N,,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,22.5,,,,,,,,,,,,
 EY58R.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
 EY58R.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,
-EY58R.1,,CU,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
+EY58R.1,CU,P,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
 EY59G.1,NIC,BE,BOP,I,,0,0,0,0,0,0,0,0,0,0,0,0,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
 EY59G.1,NIC,BE,EV,I,,0,0,0,0,0,0,0,0,0,0,0,0,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667
 EY59G.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667,-29.16666667
-EY59G.1,,CU,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+EY59G.1,CU,P,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 EY59G.2,NIC,BE,BOP,I,,0,0,0,0,0,0,0,0,0,0,0,0,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25
 EY59G.2,NIC,BE,EV,I,,0,0,0,0,0,0,0,0,0,0,0,0,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333
 EY59G.2,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333,-38.33333333
-EY59G.2,,CU,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+EY59G.2,CU,P,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 EY59R.1,NIC,BE,BOP,I,,0,0,0,0,0,0,0,0,0,0,0,0,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5
 EY59R.1,NIC,BE,EV,I,,0,0,0,0,0,0,0,0,0,0,0,0,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75
 EY59R.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75,8.75
-EY59R.1,,CU,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+EY59R.1,CU,P,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 EY59R.2,NIC,BE,BOP,I,,0,0,0,0,0,0,0,0,0,0,0,0,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5,7.5
 EY59R.2,NIC,BE,EV,I,,0,0,0,0,0,0,0,0,0,0,0,0,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5
 EY59R.2,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5,11.5
-EY59R.2,,CU,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+EY59R.2,CU,P,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 EY63G.1,NIC,BE,BOP,I,2019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-100
 EY63G.1,NIC,BE,EV,I,2019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-115
 EY63G.1,NIC,BE,CL,C,2019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-115
@@ -62,4 +62,4 @@ EY63R.1,NIC,BE,BOP,N,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50
 EY63R.1,NIC,BE,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57.5
 EY63R.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,0,0,0
 EY63R.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,0,0,57.5
-EY63R.1,,CU,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,-1
+EY63R.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,0,0,-1
diff --git a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2020_12.csv b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2020_12.csv
index 3209b86f..69444cc3 100644
--- a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2020_12.csv
+++ b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2020_12.csv
@@ -11,7 +11,7 @@ MZ2.1,NIC,BE,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-
 MZ2.1,,RA,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 MZ2.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,105,0,0,105,0,0,105,0,0
 MZ2.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-15,-15,-15
-MZ2.1,,CU,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
+MZ2.1,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
 MZ2.1,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 MZ2.2,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0
 MZ2.2,NIC,BE,BOP,N,,-15,-15,-15,-30,-30,-45,-45,-30,-30,-15,-15,-15,-15,-15,-15,-30,-30,-45,-45,-30,-30,-15,-15,-15
@@ -21,7 +21,7 @@ MZ2.2,NIC,BE,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-
 MZ2.2,,RA,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 MZ2.2,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,105,0,0,105,0,0,105,0,0
 MZ2.2,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-15,-15,-15
-MZ2.2,,CU,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
+MZ2.2,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
 MZ2.2,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 MZ2.3,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0
 MZ2.3,NIC,BE,BOP,N,,-15,-15,-15,-30,-30,-45,-45,-30,-30,-15,-15,-15,-15,-15,-15,-30,-30,-45,-45,-30,-30,-15,-15,-15
@@ -31,7 +31,7 @@ MZ2.3,NIC,BE,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-
 MZ2.3,,RA,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 MZ2.3,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,105,0,0,105,0,0,105,0,0
 MZ2.3,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-15,-15,-15
-MZ2.3,,CU,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
+MZ2.3,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
 MZ2.3,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 MZ2.4,PR,BE,BOP,N,,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0,100,0,0
 MZ2.4,NIC,BE,BOP,N,,-15,-15,-15,-30,-30,-45,-45,-30,-30,-15,-15,-15,-15,-15,-15,-30,-30,-45,-45,-30,-30,-15,-15,-15
@@ -41,5 +41,5 @@ MZ2.4,NIC,BE,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-
 MZ2.4,,RA,EV,N,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
 MZ2.4,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,105,0,0,105,0,0,105,0,0
 MZ2.4,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-15,-15,-15,-35,-35,-45,-45,-35,-35,-15,-15,-15
-MZ2.4,,CU,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
+MZ2.4,CU,P,CL,C,,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-10,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5
 MZ2.4,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5,-2.5
diff --git a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_12.csv b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_12.csv
index 208149c0..7cc60a46 100644
--- a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_12.csv
+++ b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_12.csv
@@ -14,7 +14,7 @@ MZ2.1,NIC,BE,MC,N,,-5,-5,-5,-20,-20,-10,-10,-10,-10,-5,-5,-5
 MZ2.1,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 MZ2.1,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
-MZ2.1,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.1,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.1,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 MZ2.2,PR,BE,MC,I,,102,0,0,102,0,0,102,0,0,102,0,0
 MZ2.2,NIC,BE,MC,I,,-15,-15,-15,-45,-45,-40,-40,-40,-40,-15,-15,-15
@@ -27,7 +27,7 @@ MZ2.2,NIC,BE,MC,N,,-5,-5,-5,-20,-20,-10,-10,-10,-10,-5,-5,-5
 MZ2.2,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.2,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 MZ2.2,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
-MZ2.2,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.2,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.2,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 MZ2.3,PR,BE,MC,I,,102,0,0,102,0,0,102,0,0,102,0,0
 MZ2.3,NIC,BE,MC,I,,-15,-15,-15,-45,-45,-40,-40,-40,-40,-15,-15,-15
@@ -40,7 +40,7 @@ MZ2.3,NIC,BE,MC,N,,-5,-5,-5,-20,-20,-10,-10,-10,-10,-5,-5,-5
 MZ2.3,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.3,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 MZ2.3,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
-MZ2.3,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.3,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.3,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 MZ2.4,PR,BE,MC,I,,102,0,0,102,0,0,102,0,0,102,0,0
 MZ2.4,NIC,BE,MC,I,,-15,-15,-15,-45,-45,-40,-40,-40,-40,-15,-15,-15
@@ -53,5 +53,5 @@ MZ2.4,NIC,BE,MC,N,,-5,-5,-5,-20,-20,-10,-10,-10,-10,-5,-5,-5
 MZ2.4,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.4,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 MZ2.4,NIC,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
-MZ2.4,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.4,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.4,,RA,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_6.csv b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_6.csv
index 53260d5c..2682e66f 100644
--- a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_6.csv
+++ b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/NominalCashflows_ActualsCase_CH_2021_6.csv
@@ -14,7 +14,7 @@ MZ2.1,NIC,BE,MC,N,,-5,-5,-5,-10,-10,-20,-20,-10,-10,-5,-5,-5
 MZ2.1,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.1,PR,BE,CL,C,,0,0,0,0,0,0,100,0,0,100,0,0
 MZ2.1,NIC,BE,CL,C,,0,0,0,0,0,0,-65,-50,-50,-20,-20,-20
-MZ2.1,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.1,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.1,,RA,CL,C,,0,0,0,0,0,0,-3.25,-3.25,-3.25,-3.25,-3.25,-3.25
 MZ2.2,PR,BE,MC,I,,100,0,0,100,0,0,100,0,0,100,0,0
 MZ2.2,NIC,BE,MC,I,,-15,-15,-15,-40,-40,-45,-45,-40,-40,-15,-15,-15
@@ -27,7 +27,7 @@ MZ2.2,NIC,BE,MC,N,,-5,-5,-5,-10,-10,-20,-20,-10,-10,-5,-5,-5
 MZ2.2,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.2,PR,BE,CL,C,,0,0,0,0,0,0,100,0,0,100,0,0
 MZ2.2,NIC,BE,CL,C,,0,0,0,0,0,0,-65,-50,-50,-20,-20,-20
-MZ2.2,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.2,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.2,,RA,CL,C,,0,0,0,0,0,0,-3.25,-3.25,-3.25,-3.25,-3.25,-3.25
 MZ2.3,PR,BE,MC,I,,100,0,0,100,0,0,100,0,0,100,0,0
 MZ2.3,NIC,BE,MC,I,,-15,-15,-15,-40,-40,-45,-45,-40,-40,-15,-15,-15
@@ -40,7 +40,7 @@ MZ2.3,NIC,BE,MC,N,,-5,-5,-5,-10,-10,-20,-20,-10,-10,-5,-5,-5
 MZ2.3,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.3,PR,BE,CL,C,,0,0,0,0,0,0,100,0,0,100,0,0
 MZ2.3,NIC,BE,CL,C,,0,0,0,0,0,0,-65,-50,-50,-20,-20,-20
-MZ2.3,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.3,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.3,,RA,CL,C,,0,0,0,0,0,0,-3.25,-3.25,-3.25,-3.25,-3.25,-3.25
 MZ2.4,PR,BE,MC,I,,100,0,0,100,0,0,100,0,0,100,0,0
 MZ2.4,NIC,BE,MC,I,,-15,-15,-15,-40,-40,-45,-45,-40,-40,-15,-15,-15
@@ -53,5 +53,5 @@ MZ2.4,NIC,BE,MC,N,,-5,-5,-5,-10,-10,-20,-20,-10,-10,-5,-5,-5
 MZ2.4,,RA,MC,N,,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25,-1.25
 MZ2.4,PR,BE,CL,C,,0,0,0,0,0,0,100,0,0,100,0,0
 MZ2.4,NIC,BE,CL,C,,0,0,0,0,0,0,-65,-50,-50,-20,-20,-20
-MZ2.4,,CU,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
+MZ2.4,CU,P,CL,C,,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25,-6.25
 MZ2.4,,RA,CL,C,,0,0,0,0,0,0,-3.25,-3.25,-3.25,-3.25,-3.25,-3.25
diff --git a/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_BE.csv b/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_BE.csv
index 11b389f9..593afbdd 100644
--- a/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_BE.csv
+++ b/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_BE.csv
@@ -3,8 +3,8 @@ ReportingNode,Year,Month,Scenario,,,,,,,,,,,,,,
 CH,2020,12,,,,,,,,,,,,,,,
 @@Cashflow,,,,,,,,,,,,,,,,,
 DataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11
-RP1.1,,CU,CL,C,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
-RPR1.1,,CU,CL,C,,50,50,50,50,50,50,50,50,50,50,50,50
+RP1.1,CU,P,CL,C,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
+RPR1.1,CU,P,CL,C,,50,50,50,50,50,50,50,50,50,50,50,50
 RP1.1,PR,BE,BOP,N,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
 RP1.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 RP1.1,NIC,BE,BOP,N,,-50,-50,-50,-50,-50,-50,-50,-50,-50,-50,-50,-50
diff --git a/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR70.csv b/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR70.csv
index c0bd388a..7859bdc3 100644
--- a/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR70.csv
+++ b/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR70.csv
@@ -3,8 +3,8 @@ ReportingNode,Year,Month,Scenario,,,,,,,,,,,,,,
 CH,2020,12,LR70,,,,,,,,,,,,,,
 @@Cashflow,,,,,,,,,,,,,,,,,
 DataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11
-RP1.1,,CU,CL,C,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
-RPR1.1,,CU,CL,C,,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333
+RP1.1,CU,P,CL,C,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
+RPR1.1,CU,P,CL,C,,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333,58.33333333
 RP1.1,PR,BE,BOP,N,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
 RP1.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 RP1.1,NIC,BE,BOP,N,,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333,-58.33333333
diff --git a/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR80.csv b/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR80.csv
index 6f1d5cdb..d2939ce7 100644
--- a/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR80.csv
+++ b/ifrs17-template/PracticalUseCases/CompareReinsuranceContracts/NominalCashflows_CH_2020_12_LR80.csv
@@ -3,8 +3,8 @@ ReportingNode,Year,Month,Scenario,,,,,,,,,,,,,,
 CH,2020,12,LR80,,,,,,,,,,,,,,
 @@Cashflow,,,,,,,,,,,,,,,,,
 DataNode,AmountType,EstimateType,AocType,Novelty,AccidentYear,Values0,Values1,Values2,Values3,Values4,Values5,Values6,Values7,Values8,Values9,Values10,Values11
-RP1.1,,CU,CL,C,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
-RPR1.1,,CU,CL,C,,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667
+RP1.1,CU,P,CL,C,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
+RPR1.1,CU,P,CL,C,,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667,66.66666667
 RP1.1,PR,BE,BOP,N,,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333,83.33333333
 RP1.1,PR,BE,CL,C,,0,0,0,0,0,0,0,0,0,0,0,0
 RP1.1,NIC,BE,BOP,N,,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667,-66.66666667
diff --git a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2020_12.csv b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2020_12.csv
index 473ce967..efeeea35 100644
--- a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2020_12.csv
+++ b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2020_12.csv
@@ -8,5 +8,5 @@ MZ1.1,NIC,BE,BOP,N,,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,-25,
 MZ1.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
 MZ1.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
 MZ1.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
-MZ1.1,,CU,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
+MZ1.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
 MZ1.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
diff --git a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2021_3.csv b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2021_3.csv
index f9e9d6b3..f1c692d3 100644
--- a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2021_3.csv
+++ b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/NominalCashflows_CsmSwitch_CH_2021_3.csv
@@ -17,5 +17,5 @@ MZ1.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
 MZ1.1,PR,BE,CL,C,,0,115,0,0,115,0,0,115,0,0,115,0
 MZ1.1,ICO,BE,CL,C,,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 MZ1.1,NIC,BE,CL,C,,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29,-29
-MZ1.1,,CU,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5
+MZ1.1,CU,P,CL,C,,-15,-7,-7,-7,-7,-7,-7,-7,-7,-7,-7,-5
 MZ1.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
diff --git a/ifrs17-template/Test/Data/DataNodeParameter_Duplicate.csv b/ifrs17-template/Test/Data/DataNodeParameter_Duplicate.csv
deleted file mode 100644
index 2c844eef..00000000
--- a/ifrs17-template/Test/Data/DataNodeParameter_Duplicate.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-@@Main
-ReportingNode,Year,Month
-CH,2020,12
-
-@@SingleDataNodeParameter
-DataNode,PremiumAllocation
-DT1.1,0.9
-DT1.1,0.9
-
-@@InterDataNodeParameter
-DataNode,LinkedDataNode,ReinsuranceCoverage
-DTR1.1,DT1.1,1
-DT1.1,DTR1.1,1
diff --git a/ifrs17-template/Test/Data/DataNodeParameter_InvalidDataNode.csv b/ifrs17-template/Test/Data/DataNodeParameter_InvalidDataNode.csv
deleted file mode 100644
index f20a6621..00000000
--- a/ifrs17-template/Test/Data/DataNodeParameter_InvalidDataNode.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-@@Main
-ReportingNode,Year,Month
-CH,2020,12
-
-@@SingleDataNodeParameter
-DataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod
-DT1.1,0.9,Monthly,Uniform
-DataNodeInvalid0,0.85,Monthly,Uniform
-
-@@InterDataNodeParameter
-DataNode,LinkedDataNode,ReinsuranceCoverage
-DTR1.1,DT1.1,1
-DataNodeInvalid1,DTR1.1,1
-DTR1.1,DataNodeInvalid2,1
diff --git a/ifrs17-template/Test/Data/DataNodeParameter_InvalidParameters.csv b/ifrs17-template/Test/Data/DataNodeParameter_InvalidParameters.csv
deleted file mode 100644
index 00108a5f..00000000
--- a/ifrs17-template/Test/Data/DataNodeParameter_InvalidParameters.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-@@Main
-ReportingNode,Year,Month
-CH,2020,12
-
-@@SingleDataNodeParameter
-DataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod
-DT1.1,0.9,Monthly,InvalidEntry
-DT1.2,0.85,InvalidEntry,Uniform
-DT1.3,0.9,,Uniform
-DT1.4,0.85,Monthly,
-DT1.5,0.9,Yearly,
-
-@@InterDataNodeParameter
-DataNode,LinkedDataNode,ReinsuranceCoverage
-DTR1.1,DT1.1,1
-DTR1.2,DT1.2,1
-DTR1.3,DT1.3,1
diff --git a/ifrs17-template/Test/Data/DataNodeParameter_InvalidReinsCov.csv b/ifrs17-template/Test/Data/DataNodeParameter_InvalidReinsCov.csv
deleted file mode 100644
index 802ab7b7..00000000
--- a/ifrs17-template/Test/Data/DataNodeParameter_InvalidReinsCov.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-@@Main
-ReportingNode,Year,Month
-CH,2020,12
-
-@@SingleDataNodeParameter
-DataNode,PremiumAllocation
-DT1.1,0.9
-
-@@InterDataNodeParameter
-DataNode,LinkedDataNode,ReinsuranceCoverage
-DT1.1,DT1.1,1
-
diff --git a/ifrs17-template/Test/Data/DataNodeParameter_MissingNonRequiredColumns.csv b/ifrs17-template/Test/Data/DataNodeParameter_MissingNonRequiredColumns.csv
deleted file mode 100644
index 068b8fa4..00000000
--- a/ifrs17-template/Test/Data/DataNodeParameter_MissingNonRequiredColumns.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-@@Main
-ReportingNode,Year,Month
-CH,2020,12
-
-@@SingleDataNodeParameter
-DataNode,PremiumAllocation
-DT1.1,0.9
-DT1.2,0.85
-DT1.3,0.9
-DT1.4,0.85
-
-@@InterDataNodeParameter
-DataNode,LinkedDataNode,ReinsuranceCoverage
-DTR1.1,DT1.1,1
-DTR1.2,DT1.2,1
-DTR1.3,DT1.3,1
diff --git a/ifrs17-template/Test/Data/NominalCashflows_CH_2020_12_DT1.1NoPrem.csv b/ifrs17-template/Test/Data/NominalCashflows_CH_2020_12_DT1.1NoPrem.csv
index 885890c3..8c6a5295 100644
--- a/ifrs17-template/Test/Data/NominalCashflows_CH_2020_12_DT1.1NoPrem.csv
+++ b/ifrs17-template/Test/Data/NominalCashflows_CH_2020_12_DT1.1NoPrem.csv
@@ -4,8 +4,8 @@ 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,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,,CU,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,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,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,,CU,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,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
diff --git a/ifrs17-template/Test/MapTemplateAndImportTest.ipynb b/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
index 4702c3dd..d87aad73 100644
--- a/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
+++ b/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
@@ -569,146 +569,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "markdown",
-            "source": [
-                "## Data Node Parameters : Validations"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "public async Task<ActivityLog> CheckErrors(string inputFileName, List<string> errorBms, IWorkspace workspace)",
-                "\n{",
-                "\n   Activity.Start();",
-                "\n   var log = await Import.FromFile(inputFileName).WithFormat(ImportFormats.DataNodeParameter).WithTarget(workspace).ExecuteAsync();",
-                "\n   log.Errors.Count().Should().Be(errorBms.Count());",
-                "\n   errorBms.Intersect(log.Errors.Select(x => x.ToString().Substring(0,x.ToString().Length-2).Substring(40)).ToArray()).Count().Should().Be(errorBms.Count());",
-                "\n   return Activity.Finish();",
-                "\n}"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var ws1 = Workspace.CreateNew();",
-                "\nws1.InitializeFrom(DataSource);"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var inputFileName = \"Data/DataNodeParameter_InvalidDataNode.csv\";",
-                "\nvar errorsBm = new List<string>(){Get(Error.InvalidDataNode, \"DataNodeInvalid0\"),",
-                "\n                                  Get(Error.InvalidDataNode, \"DataNodeInvalid1\"),",
-                "\n                                  Get(Error.InvalidDataNode, \"DataNodeInvalid2\")};",
-                "\nvar activity = await CheckErrors(inputFileName, errorsBm, ws1);",
-                "\nactivity"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var ws2 = Workspace.CreateNew();",
-                "\nws2.InitializeFrom(DataSource);"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var inputFileName = \"Data/DataNodeParameter_Duplicate.csv\";",
-                "\nvar errorsBm = new List<string>(){Get(Error.DuplicateSingleDataNode, \"DT1.1\"),",
-                "\n                                  Get(Error.DuplicateInterDataNode, \"DT1.1\",\"DTR1.1\"),};",
-                "\nvar activity = await CheckErrors(inputFileName, errorsBm, ws2);",
-                "\nactivity"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var ws3 = Workspace.CreateNew();",
-                "\nws3.InitializeFrom(DataSource);"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var inputFileName = \"Data/DataNodeParameter_InvalidReinsCov.csv\";",
-                "\nvar errorsBm = new List<string>(){Get(Error.ReinsuranceCoverageDataNode, \"DT1.1\",\"DT1.1\")};",
-                "\nvar activity = await CheckErrors(inputFileName, errorsBm, ws3);"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var ws4 = Workspace.CreateNew();",
-                "\nws4.InitializeFrom(DataSource);"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var inputFileName = \"Data/DataNodeParameter_MissingNonRequiredColumns.csv\";",
-                "\nvar errorsBm = new List<string>(){};",
-                "\nvar activity = await CheckErrors(inputFileName, errorsBm, ws4);",
-                "\nactivity"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var ws5 = Workspace.CreateNew();",
-                "\nws5.InitializeFrom(DataSource);"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                "var inputFileName = \"Data/DataNodeParameter_InvalidParameters.csv\";",
-                "\nvar errorsBm = new List<string>(){Get(Error.InvalidInterpolationMethod, \"DT1.1\"), ",
-                "\n                                  Get(Error.InvalidCashFlowPeriodicity, \"DT1.2\"),",
-                "\n                                  Get(Error.InvalidCashFlowPeriodicity, \"DT1.3\"),",
-                "\n                                  Get(Error.InvalidInterpolationMethod, \"DT1.5\")};",
-                "\nvar activity = await CheckErrors(inputFileName, errorsBm, ws5);",
-                "\nactivity"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
diff --git a/ifrs17-template/Test/ScenarioDataImportTest.ipynb b/ifrs17-template/Test/ScenarioDataImportTest.ipynb
index f943b73e..2fcc808c 100644
--- a/ifrs17-template/Test/ScenarioDataImportTest.ipynb
+++ b/ifrs17-template/Test/ScenarioDataImportTest.ipynb
@@ -114,11 +114,11 @@
                 "\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,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,,CU,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,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",
                 "\nDTR1.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",
-                "\nDTR1.1,,CU,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
+                "\nDTR1.1,CU,P,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
                 "\nDTR1.1,,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\";"
             ],
             "metadata": {},
@@ -192,7 +192,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,,110,0,0,110,0,0,110,0,0,110,0,0,0,110,0,0,110,0,0,110,0,0,110,0",
                 "\nDT1.1,NIC,BE,CL,C,,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5,-27.5",
-                "\nDT1.1,,CU,CL,C,,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-5.5,-5.5,-5.5,-5.5,-5.5,-5.5,-5.5,-5.5,-53.5,-52.5,-31.3",
+                "\nDT1.1,CU,P,CL,C,,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-5.5,-5.5,-5.5,-5.5,-5.5,-5.5,-5.5,-5.5,-53.5,-52.5,-31.3",
                 "\nDT1.1,,RA,CL,C,,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75,-2.75\";"
             ],
             "metadata": {},
@@ -318,7 +318,7 @@
                 "\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,,CU,CL,C,,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-7.5,-8.5\";"
+                "\nDT1.1,CU,P,CL,C,,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-17,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-6.5,-7.5,-8.5\";"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -505,7 +505,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,,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,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,,CU,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,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\";"
             ],
             "metadata": {},
@@ -596,11 +596,11 @@
                 "\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,,CU,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,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",
                 "\nDTR1.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",
-                "\nDTR1.1,,CU,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
+                "\nDTR1.1,CU,P,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
                 "\nDTR1.1,,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\";"
             ],
             "metadata": {},
@@ -683,7 +683,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,,CU,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,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\";"
             ],
             "metadata": {},
@@ -872,7 +872,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,,CU,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,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\";"
             ],
             "metadata": {},
diff --git a/ifrs17-template/Test/ScenarioParametersImportTest.ipynb b/ifrs17-template/Test/ScenarioParametersImportTest.ipynb
index 5dd27700..ff8fd02e 100644
--- a/ifrs17-template/Test/ScenarioParametersImportTest.ipynb
+++ b/ifrs17-template/Test/ScenarioParametersImportTest.ipynb
@@ -114,11 +114,11 @@
                 "\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,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,,CU,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,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",
                 "\nDTR1.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",
-                "\nDTR1.1,,CU,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
+                "\nDTR1.1,CU,P,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
                 "\nDTR1.1,,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\";"
             ],
             "metadata": {},
@@ -314,11 +314,11 @@
                 "\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,,131,0,0,111,0,0,111,0,0,111,0,0,0,111,0,0,111,0,0,111,0,0,111,0",
                 "\nDT1.1,NIC,BE,CL,C,,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31,-31",
-                "\nDT1.1,,CU,CL,C,,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3",
+                "\nDT1.1,CU,P,CL,C,,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-11,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-3",
                 "\nDT1.1,,RA,CL,C,,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6,-2.6",
                 "\nDTR1.1,PR,BE,CL,C,,51,0,0,51,0,0,51,0,0,51,0,0,51,0,0,51,0,0,51,0,0,51,0,0",
                 "\nDTR1.1,NIC,BE,CL,C,,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13",
-                "\nDTR1.1,,CU,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
+                "\nDTR1.1,CU,P,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
                 "\nDTR1.1,,RA,CL,C,,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31\";"
             ],
             "metadata": {},
diff --git a/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb b/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb
index a356e39d..f5f92327 100644
--- a/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb
+++ b/ifrs17-template/Test/ScenarioYieldCurveImportTest.ipynb
@@ -141,11 +141,11 @@
                 "\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,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,,CU,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,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",
                 "\nDTR1.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",
-                "\nDTR1.1,,CU,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
+                "\nDTR1.1,CU,P,CL,C,,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5",
                 "\nDTR1.1,,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\";"
             ],
             "metadata": {},
diff --git a/ifrs17/Constants/Consts.ipynb b/ifrs17/Constants/Consts.ipynb
index 74437596..f69dafa3 100644
--- a/ifrs17/Constants/Consts.ipynb
+++ b/ifrs17/Constants/Consts.ipynb
@@ -297,7 +297,7 @@
                 "public static class EstimateTypes{",
                 "\n    public const string BE = nameof(BE);     //Best Estimate",
                 "\n    public const string RA = nameof(RA);     //Risk Adjustment",
-                "\n    public const string CU = nameof(CU);     //Coverage Units",
+                "\n    public const string P = nameof(P);       //Patterns",
                 "\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",
@@ -385,6 +385,7 @@
                 "\n    public const string AC = nameof(AC);    // Attributable Commissions",
                 "\n    public const string AE = nameof(AE);    // Attributable Expenses",
                 "\n    public const string ULE = nameof(ULE);  // Unallocated Loss Adjustment Expenses",
+                "\n    public const string CU = nameof(CU);    // Coverage Units",
                 "\n}"
             ],
             "metadata": {},
@@ -482,4 +483,4 @@
             "outputs": []
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/ifrs17/Constants/Enums.ipynb b/ifrs17/Constants/Enums.ipynb
index f41c965f..d1f3e733 100644
--- a/ifrs17/Constants/Enums.ipynb
+++ b/ifrs17/Constants/Enums.ipynb
@@ -236,7 +236,7 @@
         {
             "cell_type": "code",
             "source": [
-                "public enum InterpolationMethod { NotApplicable, Uniform /*, Linear, Start, End, Custom*/ }"
+                "public enum InterpolationMethod { NotApplicable, Uniform, Start, /*End  , Linear, Custom*/ }"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Constants/Validations.ipynb b/ifrs17/Constants/Validations.ipynb
index 0152a7e0..f049c9d0 100644
--- a/ifrs17/Constants/Validations.ipynb
+++ b/ifrs17/Constants/Validations.ipynb
@@ -63,7 +63,7 @@
             "source": [
                 "public enum Error { ",
                 "\n    // Import",
-                "\n    NoMainTab, IncompleteMainTab, ParsingScientificNotation, ValueTypeNotFound, ValueTypeNotValid, ",
+                "\n    NoMainTab, IncompleteMainTab, ParsingInvalidOrScientificValue, ValueTypeNotFound, ValueTypeNotValid, ",
                 "\n    ReportingNodeInMainNotFound, YearInMainNotFound, MonthInMainNotFound, ScenarioInMainNotAvailable,",
                 "\n    AocTypeNotValid, AocTypeCompulsoryNotFound, AocTypePositionNotSupported, AocConfigurationOrderNotUnique,",
                 "\n    // Partition",
@@ -76,7 +76,7 @@
                 "\n    // Data Note State",
                 "\n    ChangeDataNodeState, InactiveDataNodeState,",
                 "\n    // Parameters",
-                "\n    ReinsuranceCoverageDataNode, DuplicateInterDataNode, DuplicateSingleDataNode, InvalidDataNode, InvalidDataNodeForOpening, InvalidCashFlowPeriodicity, InvalidInterpolationMethod,",
+                "\n    ReinsuranceCoverageDataNode, DuplicateInterDataNode, DuplicateSingleDataNode, InvalidDataNode, InvalidDataNodeForOpening, InvalidCashFlowPeriodicity, MissingInterpolationMethod, InvalidInterpolationMethod, InvalidEconomicBasisDriver, InvalidReleasePattern,",
                 "\n    // Storage",
                 "\n    DataNodeNotFound, PartnerNotFound, RatingNotFound, CreditDefaultRateNotFound, MissingPremiumAllocation, ReinsuranceCoverage, ",
                 "\n    YieldCurveNotFound, YieldCurvePeriodNotApplicable, EconomicBasisNotFound, AccountingVariableTypeNotFound,",
@@ -111,7 +111,7 @@
                 "\n    // Import",
                 "\n    (Error.NoMainTab                      , _) => $\"No Main tab in the parsed file.\",",
                 "\n    (Error.IncompleteMainTab              , _) => $\"Incomplete Main tab in the parsed file.\",",
-                "\n    (Error.ParsingScientificNotation      , 1) => $\"While parsing found real number in scientific notation: {s[0]}.\",",
+                "\n    (Error.ParsingInvalidOrScientificValue, 1) => $\"While parsing found invalid value or real number in scientific notation: {s[0]}.\",",
                 "\n    (Error.ValueTypeNotFound              , _) => $\"Value Type not found.\",",
                 "\n    (Error.ValueTypeNotValid              , 1) => $\"The Value Type {s[0]} is invalid.\",",
                 "\n    (Error.ReportingNodeInMainNotFound    , _) => $\"Reporting Node missing from the Main tab.\",",
@@ -154,8 +154,12 @@
                 "\n    (Error.DuplicateSingleDataNode        , 1) => $\"Duplicated Single-DataNode parameter for {s[0]} is found.\",",
                 "\n    (Error.InvalidDataNode                , 1) => $\"Data imported for invalid Data Node {s[0]}.\",",
                 "\n    (Error.InvalidDataNodeForOpening      , 1) => $\"Data imported for invalid Data Node or for a Data Node after its inception year {s[0]}.\",",
-                "\n    (Error.InvalidCashFlowPeriodicity, 1) => $\"Single Data Node Parameter CashFlowPeriodicity for Data Node {s[0]} is invalid.\",",
-                "\n    (Error.InvalidInterpolationMethod, 1) => $\"Single Data Node Parameter InterpolationMethod for Data Node {s[0]} is invalid.\",",
+                "\n    (Error.InvalidCashFlowPeriodicity     , 1) => $\"Invalid CashFlowPeriodicity parameter for Data Node {s[0]}.\",",
+                "\n    (Error.MissingInterpolationMethod     , 1) => $\"Missing InterpolationMethod parameter for Data Node {s[0]}.\",",
+                "\n    (Error.InvalidInterpolationMethod     , 1) => $\"Invalid InterpolationMethod parameter for Data Node {s[0]}.\",",
+                "\n    (Error.InvalidEconomicBasisDriver     , 1) => $\"Invalid EconomicBasisDriver parameter for Data Node {s[0]}.\",",
+                "\n    (Error.InvalidReleasePattern          , 1) => $\"Invalid ReleasePattern parameters for Data Node {s[0]}.\",",
+                "\n    ",
                 "\n    // Storage",
                 "\n    (Error.DataNodeNotFound               , 1) => $\"DataNode {s[0]} not found.\",",
                 "\n    (Error.PartnerNotFound                , 1) => $\"Partner not found for DataNode {s[0]}.\",",
diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index cd156be2..337eb9de 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -505,7 +505,8 @@
                 "\n- It is a mandatory AoC Type as it is used to trigger the Run off of the cash flow. This is achieved by providing a cash flow of 0s. ",
                 "\n- It is the first AoC Type for the Combined Novelty and therefore it carries the contribution of combining In force and New business.",
                 "\n- Its present value is computed as telescoping difference with the last AoC Step for the In-Force novelty and the New Business novelty.",
-                "\n- In the technical margin calculation it is used to merge the profitability of the In-Force and New business components, which may result in a forced switch."
+                "\n- In the technical margin calculation it is used to merge the profitability of the In-Force and New business components, which may result in a forced switch.",
+                "\n- If ReleasePattern is provided in the Cash Flows it must be provided for this AocType."
             ],
             "metadata": {},
             "execution_count": 0,
@@ -1559,9 +1560,17 @@
                 "\n## Data Node Parameters",
                 "\n",
                 "\nData Node Parameters are used to keep track of other parameters pertaining to each Data Node, and their movements in time (year and month).",
+                "\n",
                 "\n<br> <code>PremiumAllocation</code> : defines the weight of Premium to be included in the Experience Adjustement AoC Type of the Technical Margin and is valid only for Group of Insurance Contract with LiabilityType : Liability for Remaining Coverage.",
-                "\n<br> <code>CashFlowPeriodicity</code> : defines the periodicity of the provided cash flows, it is not a mandatory input. Supported values can be found [here](../Constants/Enums#cashflowperiodicity). When the column *CashFlowPeriodicity* is missing from the input file it is assumed a monthly periodicity (default value). When the *CashFlowPeriodicity* column is present, a valid value must be entered. ",
-                "\n<br> <code>InterpolationMethod</code> : defines the interpolation method to be applied to interpolate the cash flow to the monthly granularity, it is not a mandatory input. Supported values can be found [here](../Constants/Enums#interpolation-method). When the *InterpolationMethod* is not present in the input file or the *CashFlowPeriodicity* has the default value, then the default value for the *InterpolationMethod* is applied. The default value is Not Applicable. ",
+                "\n",
+                "\n<br> <code>CashFlowPeriodicity</code> : defines the periodicity of the provided cash flows, it is not a mandatory input column. Supported values can be found [here](../Constants/Enums#cashflowperiodicity). When the column *CashFlowPeriodicity* is missing from the input file it is assumed a monthly periodicity (default value). When the *CashFlowPeriodicity* column is present, a valid value must be entered. If the Cashflow file does not contain a specific CashflowPeriodicity, this parameter value is used for the whole of DataNode.",
+                "\n",
+                "\n<br> <code>InterpolationMethod</code> : defines the interpolation method to be applied to interpolate the cash flow from non-default (monthly) periodicity. It is not a mandatory input column, unless CashflowPeriodicity column is provided. Supported values can be found [here](../Constants/Enums#interpolation-method). When the *InterpolationMethod* is not present in the input file and it is required because *CashFlowPeriodicity* is not monthly, then the default value for the *InterpolationMethod* is applied. The default value is 'NotApplicable'.",
+                "\n",
+                "\n<br> <code>ReleasePattern</code> : defines the pattern of factors that will be used to defer and amortize any AmountType over the course of contract term. It is not a mandatory input.  This pattern is used, if no *ReleasePattern* is provided in the Cashflows (which is specific for combinations of AmountType and EstimateType). If provided, the ReleasePattern needs at least a column with 'ReleasePattern0' header. The 'ReleasePattern0' corresponds to the first value of the AnnualCohort which is defined in [GroupOfContracts](#group-of-contracts). Pattern for multiple years can be provided by adding columns 'ReleasePattern1', 'ReleasePattern2' etc. Even if the ReleasePattern header is present, the values for any given DataNode are still optional.",
+                "\n",
+                "\n<br> <code>EconomicBasisDriver</code> : defines the economic basis that will be used in discounting any Release Pattern. It is not a mandatory input column. Supported values are the defined values for [EconomicBasis](#economic-basis). When the *EconomicBasisDriver* is not present in the input file, then the default value for the *EconomicBasisDriver* is applied. The default value is *Locked-in* rates for Building Block Approach, *Current* rates for Variable Fee Approach and Premium Allocation Approach for liabilities of incurred claims and *Nominal* for Premium Allocation Approach for liabilities of remaining coverage.",
+                "\n",
                 "\n<br> <code>ReinsuranceCoverage</code> : defines the weight of the underlying gross business to be considered in the computation of the allocation of the Technical Margin in a Reinsurance case. In other words, it represents the percentage to which claims in the underlying GICs are expected to be reinboursed by the Reinsurance Contracts belonging to the GRIC. For proportional contracts, this factor is given by the cession while for other contracts it should be estimated. ",
                 "\n",
                 "\nThe latest Data Node Parameters available in the system with Year and Month earlier or equal to Year and Month of the closing period will be used as the current value during calculation."
@@ -1621,11 +1630,19 @@
                 "\n    [Dimension(typeof(CashFlowPeriodicity))]",
                 "\n    [Display(Order = 30)]",
                 "\n    public CashFlowPeriodicity CashFlowPeriodicity { get; init; }",
-                "\n    ",
+                "\n",
                 "\n    [Dimension(typeof(InterpolationMethod))]",
                 "\n    [Display(Order = 40)]",
                 "\n    public InterpolationMethod InterpolationMethod { get; init; }",
-                "\n    ",
+                "\n",
+                "\n    [Dimension(typeof(EconomicBasis))]",
+                "\n    [Display(Order = 50)]",
+                "\n    public string EconomicBasisDriver {get; init;}",
+                "\n",
+                "\n    [Conversion(typeof(PrimitiveArrayConverter))]",
+                "\n    [Display(Order = 60)]",
+                "\n    public double[] ReleasePattern {get; init;}",
+                "\n",
                 "\n}",
                 "\n",
                 "\npublic record InterDataNodeParameter : DataNodeParameter {",
diff --git a/ifrs17/Import/2ImportScope-PresentValue.ipynb b/ifrs17/Import/2ImportScope-PresentValue.ipynb
index 46d985d5..dc8994f1 100644
--- a/ifrs17/Import/2ImportScope-PresentValue.ipynb
+++ b/ifrs17/Import/2ImportScope-PresentValue.ipynb
@@ -797,10 +797,13 @@
                 "\n{   ",
                 "\n    [NotVisible] string EconomicBasis => GetContext();",
                 "\n    ",
-                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
-                "\n    string EstimateType => EstimateTypes.CU;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(AmountType))]",
+                "\n    string AmountType => AmountTypes.CU;",
                 "\n    ",
-                "\n    double[] Values => GetScope<DiscountedCashflow>((Identity, (string)null, EstimateType, (int?)null)).Values;",
+                "\n    [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
+                "\n    string EstimateType => EstimateTypes.P;    ",
+                "\n",
+                "\n    double[] Values => GetScope<DiscountedCashflow>((Identity, AmountType, EstimateType, (int?)null)).Values;",
                 "\n}"
             ],
             "metadata": {},
@@ -848,7 +851,7 @@
             "source": [
                 "public interface MonthlyAmortizationFactorCashflow : IScope<ImportIdentity, ImportStorage>",
                 "\n{",
-                "\n    private double[] NominalCuCashflow => GetScope<NominalCashflow>((Identity with {AocType = AocTypes.CL}, (string)null, EstimateTypes.CU, (int?)null)).Values;",
+                "\n    private double[] NominalCuCashflow => GetScope<NominalCashflow>((Identity with {AocType = AocTypes.CL}, AmountTypes.CU, EstimateTypes.P, (int?)null)).Values;",
                 "\n    private double[] DiscountedCuCashflow => Multiply(-1d, GetScope<CoverageUnitCashflow>(Identity with {AocType = AocTypes.CL}, o => o.WithContext(EconomicBasis)).Values);",
                 "\n    ",
                 "\n    [NotVisible] string EconomicBasis => GetContext();",
@@ -914,15 +917,6 @@
             "metadata": {},
             "execution_count": 0,
             "outputs": []
-        },
-        {
-            "cell_type": "code",
-            "source": [
-                ""
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
         }
     ]
 }
\ No newline at end of file
diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index 99450cfb..f7eca041 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -71,6 +71,7 @@
                 "\n    public HashSet<AocStep> AocTypeMap;",
                 "\n    private HashSet<string> estimateTypes;",
                 "\n    private HashSet<string> amountTypes;",
+                "\n    private HashSet<string> economicBasis;",
                 "\n    private Dictionary<string, HashSet<string>> amountTypesByEstimateType => GetAmountTypesByEstimateType(HierarchyCache);",
                 "\n    public HashSet<string> TechnicalMarginEstimateTypes => GetTechnicalMarginEstimateType(); ",
                 "\n    public Dictionary<Type, Dictionary<string, string>> DimensionsWithExternalId;",
@@ -149,6 +150,7 @@
                 "\n        EstimateType = (await dataSource.Query<EstimateType>().ToArrayAsync()).ToDictionary(x => x.SystemName);",
                 "\n        AmountType = (await dataSource.Query<AmountType>().Where(x =>!(x is DeferrableAmountType)).ToArrayAsync()).ToDictionary(x => x.SystemName);",
                 "\n        amountTypes = (await dataSource.Query<AmountType>().ToArrayAsync()).Select(at => at.SystemName).ToHashSet();",
+                "\n        economicBasis = (await dataSource.Query<EconomicBasis>().ToArrayAsync()).Select(eb => eb.SystemName).ToHashSet();",
                 "\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())",
@@ -239,6 +241,21 @@
                 "\n        if (amountTypesByEstimateType.TryGetValue(estimateType, out var ats) && ats.Any() && !ats.Contains(amountType))",
                 "\n            ApplicationMessage.Log(Error.InvalidAmountTypeEstimateType, estimateType, amountType);",
                 "\n    }",
+                "\n",
+                "\n    public string ValidateEconomicBasisDriver(string eb, string goc){",
+                "\n        if(string.IsNullOrEmpty(eb))",
+                "\n            return (DataNodeDataBySystemName[goc].ValuationApproach, DataNodeDataBySystemName[goc].LiabilityType) switch {",
+                "\n                (ValuationApproaches.BBA, _) => EconomicBases.L,",
+                "\n                (ValuationApproaches.VFA, _) => EconomicBases.C,",
+                "\n                (ValuationApproaches.PAA, LiabilityTypes.LIC) => EconomicBases.C,",
+                "\n                _ => EconomicBases.N,",
+                "\n            };",
+                "\n        if(!economicBasis.Contains(eb)){",
+                "\n                ApplicationMessage.Log(Error.InvalidEconomicBasisDriver, goc);",
+                "\n                return null;",
+                "\n            }",
+                "\n        return eb;",
+                "\n    }",
                 "\n}"
             ],
             "metadata": {},
@@ -1164,6 +1181,8 @@
                 "\n",
                 "\n    var hasCashFlowPeriodicityColumn = dataSet.Tables[nameof(SingleDataNodeParameter)].Columns.Any(x => x.ColumnName == nameof(SingleDataNodeParameter.CashFlowPeriodicity));",
                 "\n    var hasInterpolationMethodColumn = dataSet.Tables[nameof(SingleDataNodeParameter)].Columns.Any(x => x.ColumnName == nameof(SingleDataNodeParameter.InterpolationMethod));",
+                "\n    var hasEconomicBasisDriverColumn = dataSet.Tables[nameof(SingleDataNodeParameter)].Columns.Any(x => x.ColumnName == nameof(SingleDataNodeParameter.EconomicBasisDriver));",
+                "\n    var hasReleasePattern = dataSet.Tables[nameof(SingleDataNodeParameter)].Columns.Any(x => x.ColumnName.StartsWith(nameof(SingleDataNodeParameter.ReleasePattern)));",
                 "\n",
                 "\n    var importLog = await Import.FromDataSet(dataSet)",
                 "\n                                .WithType<SingleDataNodeParameter>( (dataset, datarow) => {",
@@ -1176,10 +1195,10 @@
                 "\n                                    if(singleDataNode.Contains(dataNode)) { ApplicationMessage.Log(Error.DuplicateSingleDataNode, dataNode); return null; }",
                 "\n                                    singleDataNode.Add(dataNode);",
                 "\n                                   ",
-                "\n                                    CashFlowPeriodicity periodicity = default;",
+                "\n                                    CashFlowPeriodicity cashFlowPeriodicity = default;",
                 "\n                                    if (hasCashFlowPeriodicityColumn)",
                 "\n                                        if ( Enum.TryParse(datarow.Field<string>(nameof(SingleDataNodeParameter.CashFlowPeriodicity)), out CashFlowPeriodicity cfp))",
-                "\n                                            periodicity = cfp;",
+                "\n                                            cashFlowPeriodicity = cfp;",
                 "\n                                        else { ApplicationMessage.Log(Error.InvalidCashFlowPeriodicity, dataNode); return null; }",
                 "\n",
                 "\n                                    InterpolationMethod interpolationMethod = default;",
@@ -1188,9 +1207,22 @@
                 "\n                                            var interpolationMethodInput = datarow.Field<string>(nameof(SingleDataNodeParameter.InterpolationMethod));",
                 "\n                                            if ( Enum.TryParse(interpolationMethodInput, out InterpolationMethod ipm)) ",
                 "\n                                                interpolationMethod = ipm;",
-                "\n                                            else if ( !(periodicity == (CashFlowPeriodicity)default && string.IsNullOrEmpty(interpolationMethodInput)) ) { ApplicationMessage.Log(Error.InvalidInterpolationMethod, dataNode); return null; }",
-                "\n                                        }",
-                "\n",
+                "\n                                            else if ( !(cashFlowPeriodicity == (CashFlowPeriodicity)default && string.IsNullOrEmpty(interpolationMethodInput)) ) { ApplicationMessage.Log(Error.InvalidInterpolationMethod, dataNode); return null; }",
+                "\n                                    }",
+                "\n                                    ",
+                "\n                                    string economicBasisDriverInput = default;",
+                "\n                                    if(hasEconomicBasisDriverColumn)",
+                "\n                                        economicBasisDriverInput = datarow.Field<string>(nameof(SingleDataNodeParameter.EconomicBasisDriver));",
+                "\n                                        var economicBasisDriver = storage.ValidateEconomicBasisDriver(economicBasisDriverInput, dataNode);",
+                "\n",
+                "\n                                    double[] releasePattern = default;",
+                "\n                                    if(hasReleasePattern)",
+                "\n                                        releasePattern = datarow.Table.Columns",
+                "\n                                            .Where(c => c.ColumnName.StartsWith(nameof(SingleDataNodeParameter.ReleasePattern)))",
+                "\n                                            .OrderBy(c => c.ColumnName.Length).ThenBy(c => c.ColumnName)",
+                "\n                                            .Select(x => datarow.Field<string>(x.ColumnName).CheckStringForExponentialAndConvertToDouble())",
+                "\n                                            .ToArray().Prune();",
+                "\n            ",
                 "\n                                    //Instantiate SingleDataNodeParameter",
                 "\n                                    return new SingleDataNodeParameter {",
                 "\n                                        Year = args.Year,",
@@ -1198,8 +1230,10 @@
                 "\n                                        Scenario = args.Scenario,",
                 "\n                                        Partition = storage.TargetPartitionByReportingNode.Id,",
                 "\n                                        DataNode = dataNode,",
-                "\n                                        CashFlowPeriodicity = periodicity,",
+                "\n                                        CashFlowPeriodicity = cashFlowPeriodicity,",
                 "\n                                        InterpolationMethod = interpolationMethod,",
+                "\n                                        EconomicBasisDriver = economicBasisDriver,",
+                "\n                                        ReleasePattern = releasePattern,",
                 "\n                                        PremiumAllocation = (datarow.Field<object>(nameof(SingleDataNodeParameter.PremiumAllocation)))",
                 "\n                                                                .ToString().CheckStringForExponentialAndConvertToDouble(),",
                 "\n                                    };",
@@ -1334,18 +1368,51 @@
                 "\n    if(Activity.HasErrors()) return Activity.Finish();",
                 "\n    ",
                 "\n    var hasAccidentYearColumn = dataSet.Tables[ImportFormats.Cashflow].Columns.Any(x => x.ColumnName == nameof(RawVariable.AccidentYear));",
+                "\n    var hasCashFlowPeriodicityColumn = dataSet.Tables[ImportFormats.Cashflow].Columns.Any(x => x.ColumnName == nameof(CashFlowPeriodicity));",
+                "\n    var hasInterpolationMethodColumn = dataSet.Tables[ImportFormats.Cashflow].Columns.Any(x => x.ColumnName == nameof(InterpolationMethod));",
                 "\n    ",
                 "\n    var importLog = await Import.FromDataSet(dataSet)",
                 "\n        .WithType<RawVariable> ( (dataset, datarow) => {",
                 "\n            var aocType = datarow.Field<string>(nameof(RawVariable.AocType));",
                 "\n            var novelty = datarow.Field<string>(nameof(RawVariable.Novelty));",
                 "\n            var dataNode = datarow.Field<string>(nameof(DataNode));",
-                "\n            ",
+                "\n",
+                "\n            if(hasCashFlowPeriodicityColumn && !hasInterpolationMethodColumn) { ApplicationMessage.Log(Error.MissingInterpolationMethod, dataNode); return null; };",
+                "\n",
+                "\n            // CashflowPeriodicity given by the Cashflows or else taken from the SingleDataNodeParameters",
+                "\n            CashFlowPeriodicity cashFlowPeriodicity = default;",
+                "\n            if (hasCashFlowPeriodicityColumn)",
+                "\n            {",
+                "\n                var cashFlowPeriodicityInput = datarow.Field<string>(nameof(SingleDataNodeParameter.CashFlowPeriodicity)); ",
+                "\n                if (Enum.TryParse(cashFlowPeriodicityInput, out CashFlowPeriodicity cfp))",
+                "\n                    cashFlowPeriodicity = cfp;",
+                "\n                else if (!string.IsNullOrEmpty(cashFlowPeriodicityInput)) {ApplicationMessage.Log(Error.InvalidCashFlowPeriodicity, dataNode); return null;}",
+                "\n            }",
+                "\n            else cashFlowPeriodicity = parsingStorage.GetCashFlowPeriodicity(dataNode);",
+                "\n",
+                "\n            // InterpolationMethod, if needed by CashflowPeriodicity, given by the Cashflows or else taken from the SingleDataNodeParameters",
+                "\n            InterpolationMethod interpolationMethod = default;",
+                "\n            if(cashFlowPeriodicity != new CashFlowPeriodicity()) ",
+                "\n            {",
+                "\n                if(hasInterpolationMethodColumn)",
+                "\n                {",
+                "\n                    var interpolationMethodInput = datarow.Field<string>(nameof(SingleDataNodeParameter.InterpolationMethod));",
+                "\n                    if ( Enum.TryParse(interpolationMethodInput, out InterpolationMethod ipm)) ",
+                "\n                        interpolationMethod = ipm;",
+                "\n                    else if(!string.IsNullOrEmpty(interpolationMethodInput))",
+                "\n                        {ApplicationMessage.Log(Error.InvalidInterpolationMethod, dataNode); return null;}",
+                "\n                    else ",
+                "\n                        interpolationMethod = parsingStorage.GetInterpolationMethod(dataNode);",
+                "\n                }",
+                "\n                else interpolationMethod = parsingStorage.GetInterpolationMethod(dataNode);",
+                "\n            }",
+                "\n",
+                "\n",
                 "\n            if(!parsingStorage.DataNodeDataBySystemName.TryGetValue(dataNode, out var dataNodeData)) {",
                 "\n                ApplicationMessage.Log(Error.InvalidDataNode, dataNode);",
                 "\n                return null;",
                 "\n            }",
-                "\n            ",
+                "\n",
                 "\n            // Error if AocType is not present in the mapping",
                 "\n            if(!parsingStorage.AocTypeMap.Contains(new AocStep(aocType, novelty))) {",
                 "\n                ApplicationMessage.Log(Error.AocTypeMapNotFound, aocType, novelty);",
@@ -1379,7 +1446,7 @@
                 "\n                                : (int?)null,",
                 "\n                Partition = parsingStorage.TargetPartitionByReportingNodeAndPeriod.Id,",
                 "\n                Values = Multiply(GetSign(ImportFormats.Cashflow, (aocType, valueType.AmountType, valueType.EstimateType, dataNodeData.IsReinsurance), parsingStorage.HierarchyCache), values)",
-                "\n                            .Interpolate(parsingStorage.GetCashFlowPeriodicity(dataNode), parsingStorage.GetInterpolationMethod(dataNode))",
+                "\n                            .Interpolate(cashFlowPeriodicity, interpolationMethod)",
                 "\n            };",
                 "\n            return item;",
                 "\n        }, ImportFormats.Cashflow",
diff --git a/ifrs17/Test/AggregateInterpolateTest.ipynb b/ifrs17/Test/AggregateInterpolateTest.ipynb
index 7b659c85..c21656c2 100644
--- a/ifrs17/Test/AggregateInterpolateTest.ipynb
+++ b/ifrs17/Test/AggregateInterpolateTest.ipynb
@@ -137,6 +137,15 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Method: Uniform"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
@@ -168,6 +177,34 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Method: At Start"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var yearly = cashflow.Interpolate(CashFlowPeriodicity.Yearly, InterpolationMethod.Start);",
+                "\n(yearly[0], yearly[11], yearly[12], yearly[23]).Should().Be((120, 0, 180, 0));"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Method: Not Applicable"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
diff --git a/ifrs17/Test/DataNodeParameterTest.ipynb b/ifrs17/Test/DataNodeParameterTest.ipynb
new file mode 100644
index 00000000..78532e7e
--- /dev/null
+++ b/ifrs17/Test/DataNodeParameterTest.ipynb
@@ -0,0 +1,745 @@
+{
+    "metadata": {
+        "authors": [],
+        "id": "NpyHCIZoQUC0-mOcSyoLvw",
+        "kernelspec": {
+            "display_name": "Formula Framework",
+            "language": "C#",
+            "name": "C#"
+        },
+        "language_info": {
+            "file_extension": ".cs",
+            "mimetype": "text/plain",
+            "name": "C#"
+        }
+    },
+    "nbformat": 4,
+    "nbformat_minor": 5,
+    "cells": [
+        {
+            "cell_type": "markdown",
+            "source": [
+                "<p style=\"font-weight:bold;\"> <span style=\"font-size: 36px\"> Test DataNode Validation </span> </p>"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!import \"../Import/Importers\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!import \"TestData\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Workspace Initialization "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "await Import.FromString(novelties).WithType<Novelty>().WithTarget(DataSource).ExecuteAsync();",
+                "\nawait Import.FromString(canonicalAocTypes).WithType<AocType>().WithTarget(DataSource).ExecuteAsync();",
+                "\nawait Import.FromString(canonicalAocConfig).WithFormat(ImportFormats.AocConfiguration).WithTarget(DataSource).ExecuteAsync();"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "await DataSource.UpdateAsync(reportingNodes);",
+                "\nawait DataSource.UpdateAsync<Portfolio>(dt1.RepeatOnce());",
+                "\nawait DataSource.UpdateAsync<Portfolio>(dtr1.RepeatOnce());",
+                "\nawait DataSource.UpdateAsync<GroupOfInsuranceContract>(new [] {dt11});",
+                "\nawait DataSource.UpdateAsync<GroupOfReinsuranceContract>(new [] {dtr11});"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "await DataSource.UpdateAsync(new [ ] {dt11State,dtr11State});"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "await Import.FromString(estimateType).WithType<EstimateType>().WithTarget(DataSource).ExecuteAsync();",
+                "\nawait Import.FromString(economicBasis).WithType<EconomicBasis>().WithTarget(DataSource).ExecuteAsync();"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "await DataSource.UpdateAsync(new [ ] {yieldCurvePrevious});"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "await DataSource.UpdateAsync(new[]{partition, previousPeriodPartition});",
+                "\nawait DataSource.UpdateAsync(new[]{partitionReportingNode});"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "Workspace.Initialize(x => x.FromSource(DataSource).DisableInitialization<RawVariable>().DisableInitialization<IfrsVariable>());"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Test"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "public async Task<ActivityLog> TestValidation(string inputFile,  List<string> errorBms){",
+                "\n    var ws = Workspace.CreateNew();",
+                "\n    ws.InitializeFrom(DataSource);",
+                "\n    Activity.Start();",
+                "\n    var log = await Import.FromString(inputFile).WithFormat(ImportFormats.DataNodeParameter).WithTarget(ws).ExecuteAsync();",
+                "\n    log.Errors.Count().Should().Be(errorBms.Count());",
+                "\n    errorBms.Intersect(log.Errors.Select(x => x.ToString().Substring(0,x.ToString().Length-2).Substring(40)).ToArray()).Count().Should().Be(errorBms.Count());",
+                "\n    return Activity.Finish();",
+                "\n}"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Use Cases"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Invalid DataNode in Single and Inter Parameter"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod",
+                "\nDT1.1,0.9,Monthly,Uniform",
+                "\nDataNodeInvalid0,0.85,Monthly,Uniform",
+                "\n",
+                "\n@@InterDataNodeParameter",
+                "\nDataNode,LinkedDataNode,ReinsuranceCoverage",
+                "\nDTR1.1,DT1.1,1",
+                "\nDataNodeInvalid1,DTR1.1,1",
+                "\nDTR1.1,DataNodeInvalid2,1\";",
+                "\n",
+                "\nvar errorsBm = new List<string>(){Get(Error.InvalidDataNode, \"DataNodeInvalid0\"),",
+                "\n                                  Get(Error.InvalidDataNode, \"DataNodeInvalid1\"),",
+                "\n                                  Get(Error.InvalidDataNode, \"DataNodeInvalid2\")};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Duplicated DataNode"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation",
+                "\nDT1.1,0.9",
+                "\nDT1.1,0.9",
+                "\n",
+                "\n@@InterDataNodeParameter",
+                "\nDataNode,LinkedDataNode,ReinsuranceCoverage",
+                "\nDTR1.1,DT1.1,1",
+                "\nDT1.1,DTR1.1,1",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.DuplicateSingleDataNode, \"DT1.1\"),",
+                "\n                                  Get(Error.DuplicateInterDataNode, \"DT1.1\",\"DTR1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Reinsurance Coverage"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"",
+                "\n@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,",
+                "\nDT1.1,0.85,",
+                "\n@@InterDataNodeParameter",
+                "\nDataNode,LinkedDataNode,ReinsuranceCoverage",
+                "\nDT1.1,DT1.1,1",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.ReinsuranceCoverageDataNode, \"DT1.1\",\"DT1.1\")};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Interpolation Method"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Wrong value fails"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod",
+                "\nDT1.1,0.85,Monthly,InvalidEntry",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.InvalidInterpolationMethod, \"DT1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Null value passes when interpolation is required "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod",
+                "\nDT1.1,0.85,Monthly,,",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){};//Get(Error.InvalidInterpolationMethod, \"DT1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Null value is not accepted when interpolation is required"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod",
+                "\nDT1.1,0.85,Yearly,,",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.InvalidInterpolationMethod, \"DT1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## CashFlow Periodicity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Wrong Value"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod",
+                "\nDT1.1,0.85,A,,",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.InvalidCashFlowPeriodicity, \"DT1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Null value not allowed",
+                "\n#### Case 1 : with a valid interpolation "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod",
+                "\nDT1.1,0.85,,Uniform,",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.InvalidCashFlowPeriodicity, \"DT1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "#### Case 2 : without a valid interpolation "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,CashFlowPeriodicity,InterpolationMethod",
+                "\nDT1.1,0.85,,,",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.InvalidCashFlowPeriodicity, \"DT1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## EconomicBasis"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Wrong Value"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,EconomicBasisDriver",
+                "\nDT1.1,0.85,A",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.InvalidEconomicBasisDriver, \"DT1.1\"),};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Default values"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,EconomicBasisDriver",
+                "\nDT1.1,0.85,",
+                "\n\";"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var economicBasisDriverByValuationApproach = new Dictionary<(string,string),string>{",
+                "\n     {(ValuationApproaches.BBA, LiabilityTypes.LIC), EconomicBases.L},",
+                "\n     {(ValuationApproaches.BBA, LiabilityTypes.LRC), EconomicBases.L},",
+                "\n     {(ValuationApproaches.VFA, LiabilityTypes.LIC), EconomicBases.C},",
+                "\n     {(ValuationApproaches.VFA, LiabilityTypes.LRC), EconomicBases.C},",
+                "\n     {(ValuationApproaches.PAA, LiabilityTypes.LIC), EconomicBases.C},",
+                "\n     {(ValuationApproaches.PAA, LiabilityTypes.LRC), EconomicBases.N},",
+                "\n    };"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "public async Task<bool> CheckDefaultEbDriver((string va, string lt) key, string eb){",
+                "\n    var ws = Workspace.CreateNew();",
+                "\n    ws.InitializeFrom(DataSource);",
+                "\n    ws.InitializeFrom(DataSource);",
+                "\n    await ws.DeleteAsync(ws.Query<GroupOfInsuranceContract>());",
+                "\n    await ws.UpdateAsync<GroupOfInsuranceContract>(new [] {dt11 with {ValuationApproach = key.va, LiabilityType = key.lt}});",
+                "\n    ",
+                "\n    var log = await Import.FromString(inputFile).WithFormat(ImportFormats.DataNodeParameter).WithTarget(ws).ExecuteAsync();",
+                "\n    log.Status.Should().Be(ActivityLogStatus.Succeeded);",
+                "\n    return (await ws.Query<SingleDataNodeParameter>().ToArrayAsync()).Single().EconomicBasisDriver == eb;",
+                "\n}"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var comparison = new Dictionary<(string,string),bool>();",
+                "\nforeach (var kvp in economicBasisDriverByValuationApproach)",
+                "\n    comparison[kvp.Key] = await CheckDefaultEbDriver(kvp.Key, kvp.Value);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "comparison.All(x => x.Value).Should().BeTrue();"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Release Pattern"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Wrong Value"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,ReleasePattern0,ReleasePattern1",
+                "\nDT1.1,0.85,InvalidValue0,InvalidValue1",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){Get(Error.ParsingInvalidOrScientificValue, \"InvalidValue0\"),Get(Error.ParsingInvalidOrScientificValue, \"InvalidValue1\")};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "### Valid or Null Value "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var inputFile = ",
+                "\n@\"@@Main",
+                "\nReportingNode,Year,Month",
+                "\nCH,2020,12",
+                "\n",
+                "\n@@SingleDataNodeParameter",
+                "\nDataNode,PremiumAllocation,ReleasePattern0,ReleasePattern1",
+                "\nDT1.1,0.1,1,2",
+                "\nDTR1.1,0.85",
+                "\n\";",
+                "\nvar errorsBm = new List<string>(){};"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var activity = await TestValidation(inputFile, errorsBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ifrs17/Test/ReportStorageTest.ipynb b/ifrs17/Test/ReportStorageTest.ipynb
index 8d2c9414..0021e4c1 100644
--- a/ifrs17/Test/ReportStorageTest.ipynb
+++ b/ifrs17/Test/ReportStorageTest.ipynb
@@ -38,7 +38,8 @@
         {
             "cell_type": "code",
             "source": [
-                "await DataSource.UpdateAsync(reportingNodeG.RepeatOnce());"
+                "await DataSource.UpdateAsync(reportingNodes);",
+                "\nawait DataSource.UpdateAsync(new[]{partition, previousPeriodPartition});"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Test/TestData.ipynb b/ifrs17/Test/TestData.ipynb
index 11b7e3f7..8b5f8e0f 100644
--- a/ifrs17/Test/TestData.ipynb
+++ b/ifrs17/Test/TestData.ipynb
@@ -110,6 +110,29 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Economic Basis"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "var economicBasis = ",
+                "\n@\"@@EconomicBasis,,,,,,,,,,,",
+                "\nSystemName,DisplayName,Order",
+                "\nL,Locked-in,1",
+                "\nC,Current,10",
+                "\nN,Nominal,20\";"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "markdown",
             "source": [
@@ -197,10 +220,9 @@
         {
             "cell_type": "code",
             "source": [
-                "var reportingNodeG = new ReportingNode() {",
-                "\n    SystemName = \"G\",",
-                "\n    DisplayName = \"Group\",",
-                "\n    Currency = \"CHF\"",
+                "var reportingNodes = new ReportingNode[] {",
+                "\n    new ReportingNode() {SystemName = \"CH\",DisplayName = \"Switzerland\",Currency = \"CHF\"},",
+                "\n    new ReportingNode() {SystemName = \"G\",DisplayName = \"Group\",Currency = \"CHF\"},",
                 "\n};"
             ],
             "metadata": {},
diff --git a/ifrs17/Test/Tests.ipynb b/ifrs17/Test/Tests.ipynb
index 3158cd88..99916537 100644
--- a/ifrs17/Test/Tests.ipynb
+++ b/ifrs17/Test/Tests.ipynb
@@ -107,6 +107,15 @@
             "metadata": {},
             "execution_count": 0,
             "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!eval-notebook \"DataNodeParameterTest\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
         }
     ]
 }
\ No newline at end of file
diff --git a/ifrs17/Utils/Extensions.ipynb b/ifrs17/Utils/Extensions.ipynb
index 58b71330..c048a8c2 100644
--- a/ifrs17/Utils/Extensions.ipynb
+++ b/ifrs17/Utils/Extensions.ipynb
@@ -165,7 +165,7 @@
                 "\n{   ",
                 "\n    if (s == null) return default;",
                 "\n    if (double.TryParse(s, NumberStyles.Number, CultureInfo.InvariantCulture, out var doubleValue)) return doubleValue;",
-                "\n    else { ApplicationMessage.Log(Error.ParsingScientificNotation, s); return 1; }",
+                "\n    else { ApplicationMessage.Log(Error.ParsingInvalidOrScientificValue, s); return 1; }",
                 "\n}"
             ],
             "metadata": {},
diff --git a/ifrs17/Utils/ImportCalculationMethods.ipynb b/ifrs17/Utils/ImportCalculationMethods.ipynb
index 9beb2fb7..384ccdae 100644
--- a/ifrs17/Utils/ImportCalculationMethods.ipynb
+++ b/ifrs17/Utils/ImportCalculationMethods.ipynb
@@ -237,6 +237,7 @@
                 "\n        };",
                 "\n    ",
                 "\n    return interpolationMethod switch {",
+                "\n        InterpolationMethod.Start        => cashflowValues.SelectMany(v => Enumerable.Range(0, frequency).Select(x => x == 0 ? v : default)).ToArray(),",
                 "\n        InterpolationMethod.Uniform or _ => cashflowValues.SelectMany(v => Enumerable.Range(0, frequency).Select( _ => v / (double)frequency)).ToArray()",
                 "\n    };",
                 "\n",