diff --git a/PresentValueSeries/InitializeData.ipynb b/PresentValueSeries/InitializeData.ipynb
index aacb77e0..f7baba98 100644
--- a/PresentValueSeries/InitializeData.ipynb
+++ b/PresentValueSeries/InitializeData.ipynb
@@ -108,4 +108,4 @@
             "outputs": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/PresentValueSeries/PresentValue - Episode 2.ipynb b/PresentValueSeries/PresentValue - Episode 2.ipynb
index 9164e6e5..37e9ce42 100644
--- a/PresentValueSeries/PresentValue - Episode 2.ipynb	
+++ b/PresentValueSeries/PresentValue - Episode 2.ipynb	
@@ -507,4 +507,4 @@
             "outputs": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/ifrs17-template/Export/MapTemplate.ipynb b/ifrs17-template/Export/MapTemplate.ipynb
index 532de56e..dc792dba 100644
--- a/ifrs17-template/Export/MapTemplate.ipynb
+++ b/ifrs17-template/Export/MapTemplate.ipynb
@@ -155,7 +155,8 @@
                 "\n    .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
                 "\n    .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -240,7 +241,8 @@
                 "\n    .StateEnumConfiguration() ",
                 "\n    .DataNodeStateConfiguration(dataNodeStates)",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -326,7 +328,8 @@
                 "\n    .WithSource(Workspace)",
                 "\n    .DataNodeParameterConfiguration(dataNodeParameters)",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Import/CloseImportTemplate.ipynb b/ifrs17-template/Import/CloseImportTemplate.ipynb
index aa95ca1d..fc78fc44 100644
--- a/ifrs17-template/Import/CloseImportTemplate.ipynb
+++ b/ifrs17-template/Import/CloseImportTemplate.ipynb
@@ -121,7 +121,8 @@
                 "await Import.FromFile(pathToFile)",
                 "\n            .WithFormat(format)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -169,7 +170,8 @@
                 "await Import.FromFile(pathToFile)",
                 "\n            .WithFormat(format)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb b/ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb
index 84f27378..412f644a 100644
--- a/ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb
+++ b/ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb
@@ -80,7 +80,8 @@
                 "await Import.FromFile(\"../Files/DataNodes/DataNodes_CH.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNode)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -92,7 +93,8 @@
                 "await Import.FromFile(\"../Files/DataNodes/DataNodeStates_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeState)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -104,7 +106,8 @@
                 "await Import.FromFile(\"../Files/DataNodes/DataNodeParameters_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeParameter)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Initialization/InitSystemorphRefDataToMemory.ipynb b/ifrs17-template/Initialization/InitSystemorphRefDataToMemory.ipynb
index b0fb3cba..d406a80d 100644
--- a/ifrs17-template/Initialization/InitSystemorphRefDataToMemory.ipynb
+++ b/ifrs17-template/Initialization/InitSystemorphRefDataToMemory.ipynb
@@ -118,7 +118,8 @@
                 "\n                .WithType<Scenario>()",
                 "\n                .WithType<ProjectionConfiguration>()",
                 "\n                .WithTarget(DataSource)",
-                "\n                .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n                .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -130,7 +131,8 @@
                 "await Import.FromFile(\"../Files/Dimensions.csv\")",
                 "\n                .WithFormat(ImportFormats.AocConfiguration)",
                 "\n                .WithTarget(DataSource)",
-                "\n                .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n                .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -142,7 +144,8 @@
                 "await Import.FromFile(\"../Files/ReportingNodes/ReportingNodes.csv\")",
                 "\n                    .WithType<ReportingNode>()",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -163,36 +166,43 @@
                 "var log = await Import.FromFile(\"../Files/Parameters/YieldCurve_2019_12.csv\")",
                 "\n                        .WithFormat(ImportFormats.YieldCurve)",
                 "\n                        .WithTarget(DataSource)",
-                "\n                        .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
+                "\n                        .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                        .ExecuteAsync();",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2020_1.csv\")",
                 "\n                        .WithFormat(ImportFormats.YieldCurve)",
                 "\n                        .WithTarget(DataSource)",
-                "\n                        .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                        .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                        .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2020_3.csv\")",
                 "\n                        .WithFormat(ImportFormats.YieldCurve)",
                 "\n                        .WithTarget(DataSource)",
-                "\n                        .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                        .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                        .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2020_12.csv\")",
                 "\n                            .WithFormat(ImportFormats.YieldCurve)",
                 "\n                            .WithTarget(DataSource)",
-                "\n                            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                            .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2021_3.csv\")",
                 "\n                            .WithFormat(ImportFormats.YieldCurve)",
                 "\n                            .WithTarget(DataSource)",
-                "\n                            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                            .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2021_6.csv\")",
                 "\n                            .WithFormat(ImportFormats.YieldCurve)",
                 "\n                            .WithTarget(DataSource)",
-                "\n                            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                            .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2021_12.csv\")",
                 "\n                            .WithFormat(ImportFormats.YieldCurve)",
                 "\n                            .WithTarget(DataSource)",
-                "\n                            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader));",
+                "\n                            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                            .ExecuteAsync());",
                 "\nlog"
             ],
             "metadata": {},
@@ -205,7 +215,8 @@
                 "await Import.FromFile(\"../Files/Parameters/ExchangeRate.csv\")",
                 "\n                .WithType<ExchangeRate>()",
                 "\n                .WithTarget(DataSource)",
-                "\n                .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n                .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -217,7 +228,8 @@
                 "await Import.FromFile(\"../Files/Parameters/PartnerRating.csv\")",
                 "\n                .WithType<PartnerRating>()",
                 "\n                .WithTarget(DataSource)",
-                "\n                .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n                .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -229,7 +241,8 @@
                 "await Import.FromFile(\"../Files/Parameters/CreditDefaultRate.csv\")",
                 "\n                .WithType<CreditDefaultRate>()",
                 "\n                .WithTarget(DataSource)",
-                "\n                .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n                .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb b/ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb
index 9d7288c4..ecb29f00 100644
--- a/ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb
+++ b/ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb
@@ -96,7 +96,8 @@
                 "\n    .WithType<Scenario>()",
                 "\n    .WithType<ProjectionConfiguration>()",
                 "\n    .WithTarget(DataSource)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -108,7 +109,8 @@
                 "await Import.FromFile(\"../Files/ReportingNodes/ReportingNodes.csv\")",
                 "\n            .WithType<ReportingNode>()",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -129,36 +131,43 @@
                 "var log = await Import.FromFile(\"../Files/Parameters/YieldCurve_2019_12.csv\")",
                 "\n                    .WithFormat(ImportFormats.YieldCurve)",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync();",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2020_1.csv\")",
                 "\n                    .WithFormat(ImportFormats.YieldCurve)",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2020_3.csv\")",
                 "\n                    .WithFormat(ImportFormats.YieldCurve)",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2020_12.csv\")",
                 "\n                    .WithFormat(ImportFormats.YieldCurve)",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2021_3.csv\")",
                 "\n                    .WithFormat(ImportFormats.YieldCurve)",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2021_6.csv\")",
                 "\n                    .WithFormat(ImportFormats.YieldCurve)",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync()",
                 "\n        );",
                 "\nlog.Merge(await Import.FromFile(\"../Files/Parameters/YieldCurve_2021_12.csv\")",
                 "\n                    .WithFormat(ImportFormats.YieldCurve)",
                 "\n                    .WithTarget(DataSource)",
-                "\n                    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)",
+                "\n                    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n                    .ExecuteAsync()",
                 "\n        );",
                 "\nlog"
             ],
@@ -172,7 +181,8 @@
                 "await Import.FromFile(\"../Files/Parameters/ExchangeRate.csv\")",
                 "\n            .WithType<ExchangeRate>()",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -184,7 +194,8 @@
                 "await Import.FromFile(\"../Files/Parameters/PartnerRating.csv\")",
                 "\n            .WithType<PartnerRating>()",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -196,7 +207,8 @@
                 "await Import.FromFile(\"../Files/Parameters/CreditDefaultRate.csv\")",
                 "\n            .WithType<CreditDefaultRate>()",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -217,7 +229,8 @@
                 "await Import.FromFile(\"../Files/DataNodes/DataNodes_CH.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNode)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -229,7 +242,8 @@
                 "await Import.FromFile(\"../Files/DataNodes/DataNodeStates_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeState)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -241,7 +255,8 @@
                 "await Import.FromFile(\"../Files/DataNodes/DataNodeParameters_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeParameter)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -262,7 +277,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/Openings_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Opening)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -274,7 +290,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -286,7 +303,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -298,7 +316,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2021_3.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -310,7 +329,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2021_3.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -322,7 +342,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/SimpleValue_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.SimpleValue )",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -334,7 +355,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12_MTUP10pct.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Initialization/InitSystemorphToMemory.ipynb b/ifrs17-template/Initialization/InitSystemorphToMemory.ipynb
index d82e0186..f5a7d4bc 100644
--- a/ifrs17-template/Initialization/InitSystemorphToMemory.ipynb
+++ b/ifrs17-template/Initialization/InitSystemorphToMemory.ipynb
@@ -70,7 +70,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/Openings_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Opening)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -82,7 +83,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -94,7 +96,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -106,7 +109,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2021_3.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -118,7 +122,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2021_3.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -130,7 +135,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/SimpleValue_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.SimpleValue )",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -142,7 +148,8 @@
                 "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12_MTUP10pct.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/ActualsUseCaseDataImport.ipynb b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/ActualsUseCaseDataImport.ipynb
index 5db058d3..f3066174 100644
--- a/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/ActualsUseCaseDataImport.ipynb
+++ b/ifrs17-template/PracticalUseCases/ActualsOutsideThePeriod/ActualsUseCaseDataImport.ipynb
@@ -77,7 +77,8 @@
                 "await Import.FromFile(\"DataNodes_ActualsCase_CH.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNode)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -89,7 +90,8 @@
                 "await Import.FromFile(\"DataNodeStates_ActualsCase_CH_2020_1.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeState)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -101,7 +103,8 @@
                 "await Import.FromFile(\"DataNodeParameters_ActualsCase_CH_2020_1.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeParameter)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -131,7 +134,8 @@
                 "await Import.FromFile(\"NominalCashflows_ActualsCase_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -143,7 +147,8 @@
                 "await Import.FromFile(\"Actuals_ActualsCase_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -164,7 +169,8 @@
                 "await Import.FromFile(\"NominalCashflows_ActualsCase_CH_2021_6.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -176,7 +182,8 @@
                 "await Import.FromFile(\"Actuals_ActualsCase_CH_2021_6.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -197,7 +204,8 @@
                 "await Import.FromFile(\"NominalCashflows_ActualsCase_CH_2021_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -209,7 +217,8 @@
                 "await Import.FromFile(\"Actuals_ActualsCase_CH_2021_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/CsmSwitchDataImport.ipynb b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/CsmSwitchDataImport.ipynb
index a8493d9b..a0d0556a 100644
--- a/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/CsmSwitchDataImport.ipynb
+++ b/ifrs17-template/PracticalUseCases/SingleVsMultipleCsmSwitch/CsmSwitchDataImport.ipynb
@@ -76,7 +76,8 @@
                 "await Import.FromFile(\"DataNodes_CsmSwitch_CH.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNode)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -88,7 +89,8 @@
                 "await Import.FromFile(\"DataNodeStates_CsmSwitch_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeState)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -100,7 +102,8 @@
                 "await Import.FromFile(\"DataNodeParameters_CsmSwitch_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.DataNodeParameter)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -130,7 +133,8 @@
                 "await Import.FromFile(\"NominalCashflows_CsmSwitch_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -142,7 +146,8 @@
                 "await Import.FromFile(\"Actuals_CsmSwitch_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -154,7 +159,8 @@
                 "await Import.FromFile(\"NominalCashflows_CsmSwitch_CH_2021_3.csv\")",
                 "\n            .WithFormat(ImportFormats.Cashflow)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -166,7 +172,8 @@
                 "await Import.FromFile(\"Actuals_CsmSwitch_CH_2021_3.csv\")",
                 "\n            .WithFormat(ImportFormats.Actual)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -187,7 +194,8 @@
                 "await Import.FromFile(\"SimpleValue_CsmSwitch_CH_2020_12.csv\")",
                 "\n            .WithFormat(ImportFormats.SimpleValue)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -199,7 +207,8 @@
                 "await Import.FromFile(\"SimpleValue_CsmSwitch_CH_2021_3.csv\")",
                 "\n            .WithFormat(ImportFormats.SimpleValue)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Test/Data/InitSystemorphToMemoryForTesting.ipynb b/ifrs17-template/Test/Data/InitSystemorphToMemoryForTesting.ipynb
index 6aac2878..36b1ed2a 100644
--- a/ifrs17-template/Test/Data/InitSystemorphToMemoryForTesting.ipynb
+++ b/ifrs17-template/Test/Data/InitSystemorphToMemoryForTesting.ipynb
@@ -27,7 +27,11 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"Actuals_CH_2020_12_MTUP10pct.csv\").WithFormat(ImportFormats.Actual).WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"Actuals_CH_2020_12_MTUP10pct.csv\")",
+                "\n            .WithFormat(ImportFormats.Actual)",
+                "\n            .WithTarget(DataSource)",
+                "\n            .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Test/MapTemplateAndImportTest.ipynb b/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
index 6adc4569..39134932 100644
--- a/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
+++ b/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
@@ -166,7 +166,8 @@
                 "\n    .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
                 "\n    .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync();",
                 "\n",
                 "\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
             ],
@@ -184,7 +185,8 @@
                 "\n    .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
                 "\n    .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -265,7 +267,8 @@
                 "\n    .StateEnumConfiguration() ",
                 "\n    .DataNodeStateConfiguration(dataNodeStates)",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync();",
                 "\n",
                 "\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
             ],
@@ -281,7 +284,8 @@
                 "\n    .StateEnumConfiguration() ",
                 "\n    .DataNodeStateConfiguration(dataNodeStates)",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -357,7 +361,8 @@
                 "\n    .WithSource(Workspace)",
                 "\n    .DataNodeParameterConfiguration(dataNodeParameters)",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync();",
                 "\n",
                 "\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
             ],
@@ -372,7 +377,8 @@
                 "\n    .WithSource(Workspace)",
                 "\n    .DataNodeParameterConfiguration(dataNodeParameters)",
                 "\n    .MainTabConfiguration(partition)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17-template/Test/SequenceImportTest.ipynb b/ifrs17-template/Test/SequenceImportTest.ipynb
index e5014953..fec21ac1 100644
--- a/ifrs17-template/Test/SequenceImportTest.ipynb
+++ b/ifrs17-template/Test/SequenceImportTest.ipynb
@@ -55,7 +55,11 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12.csv\").WithFormat(ImportFormats.Cashflow).WithTarget(ws1).ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12.csv\")",
+                "\n    .WithFormat(ImportFormats.Cashflow)",
+                "\n    .WithTarget(ws1)",
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -64,7 +68,11 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2020_12.csv\").WithFormat(ImportFormats.Actual).WithTarget(ws1).ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2020_12.csv\")",
+                "\n    .WithFormat(ImportFormats.Actual)",
+                "\n    .WithTarget(ws1)",
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -99,6 +107,15 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "code",
+            "source": [
+                "#!eval-notebook \"../Initialization/InitSystemorphBaseToMemory\""
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
@@ -112,7 +129,11 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2020_12.csv\").WithFormat(ImportFormats.Actual).WithTarget(ws2).ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "await Import.FromFile(\"../Files/TransactionalData/Actuals_CH_2020_12.csv\")",
+                "\n    .WithFormat(ImportFormats.Actual)",
+                "\n    .WithTarget(ws2)",
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -121,7 +142,11 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12.csv\").WithFormat(ImportFormats.Cashflow).WithTarget(ws2).ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12.csv\")",
+                "\n    .WithFormat(ImportFormats.Cashflow)",
+                "\n    .WithTarget(ws2)",
+                "\n    .WithActivityLog(Session, DataSource, DataSetReader)",
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index d3e0e1e0..988bc676 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -54,7 +54,7 @@
             "source": [
                 "#r \"nuget:Systemorph.Activities,1.6.2\"",
                 "\n#r \"nuget:Systemorph.Arithmetics,1.6.2\"",
-                "\n#r \"nuget:Systemorph.Workspace,1.6.1\"",
+                "\n#r \"nuget:Systemorph.Workspace,1.6.3\"",
                 "\n#r \"nuget:Systemorph.InteractiveObjects,1.6.2\"",
                 "\n#r \"nuget:Systemorph.SharePoint,1.6.2\"",
                 "\n#r \"nuget:Systemorph.OneDrive,1.6.2\"",
@@ -63,11 +63,11 @@
                 "\n#r \"nuget:Systemorph.Test,1.6.2\"",
                 "\n#r \"nuget:Systemorph.Export,1.6.4\"",
                 "\n#r \"nuget:Systemorph.DataSetReader,1.6.4\"",
-                "\n#r \"nuget:Systemorph.DataSource,1.6.0\"",
-                "\n#r \"nuget:Systemorph.DataSource.Conversions,1.6.0\"",
+                "\n#r \"nuget:Systemorph.DataSource,1.6.3\"",
+                "\n#r \"nuget:Systemorph.DataSource.Conversions,1.6.3\"",
                 "\n#r \"nuget:Systemorph.Reporting,1.6.2\"",
                 "\n#r \"nuget:Systemorph.Charting,1.6.2\"",
-                "\n#r \"nuget:Systemorph.SchemaMigrations,1.6.1\""
+                "\n#r \"nuget:Systemorph.SchemaMigrations,1.6.3\""
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Utils/ActivityLog.ipynb b/ifrs17/Utils/ActivityLog.ipynb
index 2ce8b659..e0e951ca 100644
--- a/ifrs17/Utils/ActivityLog.ipynb
+++ b/ifrs17/Utils/ActivityLog.ipynb
@@ -15,6 +15,24 @@
     "nbformat": 4,
     "nbformat_minor": 5,
     "cells": [
+        {
+            "cell_type": "markdown",
+            "source": [
+                "<p style=\"font-weight:bold;\"> <span style=\"font-size: 36px\"> Activity Log </span> </p>"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Import"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
@@ -48,6 +66,25 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Data Model"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Import Export Activity ",
+                "\nEvery activity to and from (import or export) the DataSource is tracked by recording an ImportExportActivity. Among other information this record tracks the user who performe the action, the timestamp, the activity log, and a unique identifier which can be used to retrieve the data subject of the activity. "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
@@ -63,6 +100,8 @@
                 "\n",
                 "\n    public string Category {get; init;}",
                 "\n",
+                "\n    public string ExceptionMessage {get; init;}",
+                "\n",
                 "\n    [Conversion(typeof(JsonConverter<string[]>))]",
                 "\n    public string[] ErrorMessages {get; init;}",
                 "\n",
@@ -72,7 +111,7 @@
                 "\n    [Conversion(typeof(JsonConverter<string[]>))]",
                 "\n    public string[] InfoMessages {get; init;}",
                 "\n",
-                "\n    public Guid SourceId {get; init;} ",
+                "\n    public Guid? SourceId {get; init;} ",
                 "\n    ",
                 "\n    public ImportExportActivity(ActivityLog log, ISessionVariable session)",
                 "\n    {",
@@ -97,6 +136,16 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "## Keyed Import Export",
+                "\nContains the information of the file that has been the object of the activity. Among other information, it contains the content of the file in a serialized format. "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
@@ -354,83 +403,103 @@
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Helper methods "
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [
-                "public static async Task<ActivityLog> ExecuteWithStoreActivityAsync(this ImportOptionsBuilder builder, ",
-                "\n                                                                                ISessionVariable session, ",
-                "\n                                                                                IDataSource dataSource, ",
-                "\n                                                                                IDataSetImportVariable importVariable)",
+                "public record ImportBuilderWriter(ImportOptionsBuilder Builder, ",
+                "\n                                ISessionVariable Session, ",
+                "\n                                IDataSource DataSource, ",
+                "\n                                IDataSetImportVariable ImportVariable)",
                 "\n{",
-                "\n    var log = await builder.ExecuteAsync();",
-                "\n    var options = builder.GetImportOptions();",
-                "\n    var activity = new ImportExportActivity(log, session);",
-                "\n    bool importSucceeded = true;",
-                "\n    switch(options)",
+                "\n    public async Task<ActivityLog> ExecuteAsync()",
                 "\n    {",
-                "\n        case FileImportOptions fio:",
-                "\n            var importFile = new ImportFile(Guid.NewGuid());",
-                "\n            try",
-                "\n            {",
-                "\n                importFile = await (new ImportFile(fio, importVariable, session)).InitializeImportDataAsync() as ImportFile;",
-                "\n            }",
-                "\n            catch (Exception)",
-                "\n            {",
-                "\n                importSucceeded = false;",
-                "\n            }",
-                "\n            activity = activity with {SourceId = importFile.Id, ",
-                "\n                                        Category = \"Import from File\"};",
-                "\n            if (importSucceeded) await dataSource.UpdateAsync<ImportFile>(importFile.RepeatOnce());",
-                "\n            break;",
-                "\n        case StringImportOptions sgio:",
-                "\n            var importString = new ImportString(Guid.NewGuid());",
-                "\n            try",
-                "\n            {  ",
-                "\n                importString = await (new ImportString(sgio, importVariable, session)).InitializeImportDataAsync() as ImportString;",
-                "\n            }",
-                "\n            catch (Exception)",
-                "\n            {",
-                "\n                importSucceeded = false;",
-                "\n            }",
-                "\n            activity = activity with {SourceId = importString.Id, ",
-                "\n                                    Category = \"Import from String\"};",
-                "\n            if (importSucceeded) await dataSource.UpdateAsync<ImportString>(importString.RepeatOnce());",
-                "\n            break;",
-                "\n        case StreamImportOptions smio:",
-                "\n            var importStream = new ImportStream(Guid.NewGuid());",
-                "\n            try",
-                "\n            {",
-                "\n                importStream = await (new ImportStream(smio, importVariable, session)).InitializeImportDataAsync() as ImportStream;",
-                "\n            }",
-                "\n            catch (Exception)",
-                "\n            {",
-                "\n                importSucceeded = false;",
-                "\n            }",
-                "\n            activity = activity with {SourceId = importStream.Id, ",
-                "\n                                    Category = \"Import from Stream\"};",
-                "\n            if (importSucceeded) await dataSource.UpdateAsync<ImportStream>(importStream.RepeatOnce());",
-                "\n            break;",
-                "\n        case DataSetImportOptions dsio:",
-                "\n            var importDataSet = new ImportDataSet(Guid.NewGuid());",
-                "\n            try",
-                "\n            {",
-                "\n                importDataSet = await (new ImportDataSet(dsio, importVariable, session)).InitializeImportDataAsync() as ImportDataSet;",
-                "\n            }",
-                "\n            catch(Exception)",
-                "\n            {",
-                "\n                importSucceeded = false;",
-                "\n            }",
-                "\n            activity = activity with {SourceId = importDataSet.Id, ",
-                "\n                                    Category = \"Import from Data Set\"};",
-                "\n            if (importSucceeded) await dataSource.UpdateAsync<ImportDataSet>(importDataSet.RepeatOnce());",
-                "\n            break;",
-                "\n        default:",
-                "\n            throw new Exception(\"Import Options object is not an instance of an appropriate class.\");",
-                "\n            break;",
-                "\n    }                              ",
-                "\n    await dataSource.UpdateAsync<ImportExportActivity>(activity.RepeatOnce());",
-                "\n    await dataSource.CommitAsync(); ",
-                "\n    return log;",
+                "\n        var log = await Builder.ExecuteAsync();",
+                "\n        var options = Builder.GetImportOptions();",
+                "\n        var activity = new ImportExportActivity(log, Session);",
+                "\n        bool importSucceeded = true;",
+                "\n        switch(options)",
+                "\n        {",
+                "\n            case FileImportOptions fio:",
+                "\n                var importFile = new ImportFile(Guid.NewGuid());",
+                "\n                try",
+                "\n                {",
+                "\n                    importFile = await (new ImportFile(fio, ImportVariable, Session)).InitializeImportDataAsync() as ImportFile;",
+                "\n                    activity = activity with {SourceId = importFile.Id};",
+                "\n                }",
+                "\n                catch (Exception e)",
+                "\n                {",
+                "\n                    importSucceeded = false;",
+                "\n                    activity = activity with {SourceId = null, ExceptionMessage = e.Message};",
+                "\n                }",
+                "\n                activity = activity with {Category = \"Import from File\"};",
+                "\n                if (importSucceeded) await DataSource.UpdateAsync<ImportFile>(importFile.RepeatOnce());",
+                "\n                break;",
+                "\n",
+                "\n            case StringImportOptions sgio:",
+                "\n                var importString = new ImportString(Guid.NewGuid());",
+                "\n                try",
+                "\n                {",
+                "\n                    importString = await (new ImportString(sgio, ImportVariable, Session)).InitializeImportDataAsync() as ImportString;",
+                "\n                    activity = activity with {SourceId = importString.Id};",
+                "\n                }",
+                "\n                catch (Exception e)",
+                "\n                {",
+                "\n                    importSucceeded = false;",
+                "\n                    activity = activity with {SourceId = null, ExceptionMessage = e.Message};",
+                "\n                }",
+                "\n                activity = activity with {Category = \"Import from String\"};",
+                "\n                if (importSucceeded) await DataSource.UpdateAsync<ImportString>(importString.RepeatOnce());",
+                "\n                break;",
+                "\n            ",
+                "\n            case StreamImportOptions smio:",
+                "\n                var importStream = new ImportStream(Guid.NewGuid());",
+                "\n                try",
+                "\n                {",
+                "\n                    importStream = await (new ImportStream(smio, ImportVariable, Session)).InitializeImportDataAsync() as ImportStream;",
+                "\n                    activity = activity with {SourceId = importStream.Id};",
+                "\n                }",
+                "\n                catch (Exception e)",
+                "\n                {",
+                "\n                    importSucceeded = false;",
+                "\n                    activity = activity with {SourceId = null, ExceptionMessage = e.Message};",
+                "\n                }",
+                "\n                activity = activity with {Category = \"Import from Stream\"};",
+                "\n                if (importSucceeded) await DataSource.UpdateAsync<ImportStream>(importStream.RepeatOnce());",
+                "\n                break;",
+                "\n",
+                "\n            case DataSetImportOptions dsio:",
+                "\n                var importDataSet = new ImportDataSet(Guid.NewGuid());",
+                "\n                try",
+                "\n                {",
+                "\n                    importDataSet = await (new ImportDataSet(dsio, ImportVariable, Session)).InitializeImportDataAsync() as ImportDataSet;",
+                "\n                    activity = activity with {SourceId = importDataSet.Id};",
+                "\n                }",
+                "\n                catch (Exception e)",
+                "\n                {",
+                "\n                    importSucceeded = false;",
+                "\n                    activity = activity with {SourceId = null, ExceptionMessage = e.Message};",
+                "\n                }",
+                "\n                activity = activity with {Category = \"Import from Data Set\"};",
+                "\n                if (importSucceeded) await DataSource.UpdateAsync<ImportDataSet>(importDataSet.RepeatOnce());",
+                "\n                break;",
+                "\n",
+                "\n            default:",
+                "\n                throw new Exception(\"Import Options object is not an instance of an appropriate class.\");",
+                "\n                break;",
+                "\n        }",
+                "\n        await DataSource.UpdateAsync<ImportExportActivity>(activity.RepeatOnce());",
+                "\n        await DataSource.CommitAsync();",
+                "\n        return log;",
+                "\n    }",
                 "\n}"
             ],
             "metadata": {},
@@ -440,25 +509,54 @@
         {
             "cell_type": "code",
             "source": [
-                "public static async Task<ExportResult> ExecuteWithStoreActivityAsync(this IDocumentBuilder builder, ",
-                "\n                                                                    ISessionVariable session, ",
-                "\n                                                                    IDataSource dataSource, ",
-                "\n                                                                    IDataSetImportVariable importVariable)",
+                "public record ExportBuilderWriter(DocumentBuilder Builder, ",
+                "\n                                ISessionVariable Session, ",
+                "\n                                IDataSource DataSource, ",
+                "\n                                IDataSetImportVariable ImportVariable)",
                 "\n{",
-                "\n    var exportResult = await builder.ExecuteAsync();",
-                "\n    var exportFile = await (new ExportFile(builder as DocumentBuilder, importVariable, session)).InitializeExportDataAsync();",
-                "\n    var activity = new ImportExportActivity(exportResult.ActivityLog, session) with {Category = \"Export to File\", ",
+                "\n    public async Task<ExportResult> ExecuteAsync()",
+                "\n    {",
+                "\n        var exportResult = await Builder.ExecuteAsync();",
+                "\n        var exportFile = await (new ExportFile(Builder, ImportVariable, Session)).InitializeExportDataAsync();",
+                "\n        var activity = new ImportExportActivity(exportResult.ActivityLog, Session) with {Category = \"Export to File\", ",
                 "\n                                                                                    SourceId = exportFile.Id};",
-                "\n    await dataSource.UpdateAsync<ExportFile>(exportFile.RepeatOnce());",
-                "\n    await dataSource.UpdateAsync<ImportExportActivity>(activity.RepeatOnce());",
-                "\n    await dataSource.CommitAsync();",
-                "\n    return exportResult;",
+                "\n        await DataSource.UpdateAsync<ExportFile>(exportFile.RepeatOnce());",
+                "\n        await DataSource.UpdateAsync<ImportExportActivity>(activity.RepeatOnce());",
+                "\n        await DataSource.CommitAsync();",
+                "\n        return exportResult;",
+                "\n    }",
                 "\n}"
             ],
             "metadata": {},
             "execution_count": 0,
             "outputs": []
         },
+        {
+            "cell_type": "code",
+            "source": [
+                "public static ImportBuilderWriter WithActivityLog(this ImportOptionsBuilder builder, ",
+                "\n                                                    ISessionVariable session, ",
+                "\n                                                    IDataSource dataSource, ",
+                "\n                                                    IDataSetImportVariable importVariable) => ",
+                "\n                new ImportBuilderWriter(builder, session, dataSource, importVariable);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "public static ExportBuilderWriter WithActivityLog(this IDocumentBuilder builder, ",
+                "\n                                                ISessionVariable session, ",
+                "\n                                                IDataSource dataSource, ",
+                "\n                                                IDataSetImportVariable importVariable) =>",
+                "\n            new ExportBuilderWriter(builder as DocumentBuilder, session, dataSource, importVariable);"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
         {
             "cell_type": "code",
             "source": [