diff --git a/PresentValueSeries/InitializeData.ipynb b/PresentValueSeries/InitializeData.ipynb
index 97686da0..aacb77e0 100644
--- a/PresentValueSeries/InitializeData.ipynb
+++ b/PresentValueSeries/InitializeData.ipynb
@@ -58,7 +58,7 @@
                 "\n    .WithType<ValuationApproach>()           .WithType<RiskDriver>()             .WithType<ProjectionConfiguration>()    ",
                 "\n    .WithType<ExchangeRate>()",
                 "\n    .WithTarget(DataSource)",
-                "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n    .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -70,7 +70,7 @@
                 "await Import.FromFile(\"Dimensions.xlsx\")",
                 "\n            .WithFormat(ImportFormats.AocConfiguration)",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -82,7 +82,7 @@
                 "await Import.FromFile(\"DataNodes.xlsx\")",
                 "\n            .WithFormat(\"DataNode\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/PresentValueSeries/PresentValue - Episode 2.ipynb b/PresentValueSeries/PresentValue - Episode 2.ipynb
index 86c31e3c..9164e6e5 100644
--- a/PresentValueSeries/PresentValue - Episode 2.ipynb	
+++ b/PresentValueSeries/PresentValue - Episode 2.ipynb	
@@ -171,7 +171,7 @@
                 "await Import.FromFile(\"YieldCurve.xlsx\")",
                 "\n            .WithType<YieldCurve>()",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -183,7 +183,7 @@
                 "await Import.FromFile(\"Cashflows.xlsx\")",
                 "\n            .WithFormat(\"Cashflow\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/PresentValueSeries/PresentValue - Episode 3.ipynb b/PresentValueSeries/PresentValue - Episode 3.ipynb
index b2438e75..16605c69 100644
--- a/PresentValueSeries/PresentValue - Episode 3.ipynb	
+++ b/PresentValueSeries/PresentValue - Episode 3.ipynb	
@@ -171,7 +171,7 @@
                 "await Import.FromFile(\"DataNodes_CH.xlsx\")",
                 "\n            .WithFormat(\"DataNode\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -183,7 +183,7 @@
                 "await Import.FromFile(\"DataNodes_DE.xlsx\")",
                 "\n            .WithFormat(\"DataNode\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -195,7 +195,7 @@
                 "await Import.FromFile(\"YieldCurve.xlsx\")",
                 "\n            .WithType<YieldCurve>()",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -207,7 +207,7 @@
                 "await Import.FromFile(\"Cashflows.xlsx\")",
                 "\n            .WithFormat(\"Cashflow\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -219,7 +219,7 @@
                 "await Import.FromFile(\"CF_CH_2021_12.xlsx\")",
                 "\n            .WithFormat(\"Cashflow\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -231,7 +231,7 @@
                 "await Import.FromFile(\"CF_DE_2021_12.xlsx\")",
                 "\n            .WithFormat(\"Cashflow\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -243,7 +243,7 @@
                 "await Import.FromFile(\"CF_DE_2022_12.xlsx\")",
                 "\n            .WithFormat(\"Cashflow\")",
                 "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
+                "\n            .ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index 638f6679..61ff5ebc 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -1365,17 +1365,18 @@
                 "\n    if(Activity.HasErrors()) return Activity.Finish();",
                 "\n    await DataNodeFactoryAsync(dataSet, ImportFormats.SimpleValue, args);",
                 "\n    if(Activity.HasErrors()) return Activity.Finish();",
-                "\n    ",
+                "\n",
                 "\n    Guid partitionId = new Guid();",
                 "\n    var workspace = Workspace.CreateNew();",
                 "\n    var parsingLog = await ParseSimpleValueToWorkspaceAsync(dataSet, args, partitionId, workspace);",
                 "\n    if(parsingLog.Errors.Any()) return Activity.Finish().Merge(parsingLog);",
-                "\n    ",
+                "\n",
                 "\n    workspace.Query<IfrsVariable>().Select(v => new {v.DataNode, v.AccidentYear}).Distinct();",
-                "\n    ",
-                "\n    await workspace.CommitToAsync<IfrsVariable,PartitionByReportingNodeAndPeriod>(DataSource, partitionId, snapshot : true,",
-                "\n                                                                           filter : x => workspace.Query<IfrsVariable>().Select(v => v.DataNode).Distinct().Contains(x.DataNode));",
                 "\n",
+                "\n    var targetDataNodes = workspace.Query<IfrsVariable>().Select(v => v.DataNode).Distinct().ToArray();",
+                "\n    await workspace.CommitToAsync<IfrsVariable,PartitionByReportingNodeAndPeriod>(DataSource, partitionId, snapshot : true,",
+                "\n                                                                           filter : x => targetDataNodes.Contains(x.DataNode));",
+                "\n    ",
                 "\n    return Activity.Finish().Merge(parsingLog);",
                 "\n});"
             ],