diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index ecd6fbe3..2f63475c 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -43,20 +43,20 @@
         {
             "cell_type": "code",
             "source": [
-                "#r \"nuget:Systemorph.Activities,1.5.5\"",
-                "\n#r \"nuget:Systemorph.Arithmetics,1.5.5\"",
-                "\n#r \"nuget:Systemorph.Workspace,1.5.3\"",
-                "\n#r \"nuget:Systemorph.InteractiveObjects,1.5.5\"",
-                "\n#r \"nuget:Systemorph.SharePoint,1.5.6\"",
-                "\n#r \"nuget:Systemorph.OneDrive,1.5.6\"",
-                "\n#r \"nuget:Systemorph.Scopes,1.5.5\"",
-                "\n#r \"nuget:Systemorph.Import,1.5.1\"",
-                "\n#r \"nuget:Systemorph.Test,1.5.5\"",
-                "\n#r \"nuget:Systemorph.Export,1.5.1\"",
-                "\n#r \"nuget:Systemorph.DataSetReader,1.5.1\"",
-                "\n#r \"nuget:Systemorph.DataSource,1.5.3\"",
-                "\n#r \"nuget:Systemorph.DataSource.Conversions,1.5.3\"",
-                "\n#r \"nuget:Systemorph.Reporting,1.5.5\""
+                "#r \"nuget:Systemorph.Activities,1.5.7\"",
+                "\n#r \"nuget:Systemorph.Arithmetics,1.5.7\"",
+                "\n#r \"nuget:Systemorph.Workspace,1.5.4\"",
+                "\n#r \"nuget:Systemorph.InteractiveObjects,1.5.7\"",
+                "\n#r \"nuget:Systemorph.SharePoint,1.5.7\"",
+                "\n#r \"nuget:Systemorph.OneDrive,1.5.7\"",
+                "\n#r \"nuget:Systemorph.Scopes,1.5.7\"",
+                "\n#r \"nuget:Systemorph.Import,1.5.2\"",
+                "\n#r \"nuget:Systemorph.Test,1.5.7\"",
+                "\n#r \"nuget:Systemorph.Export,1.5.2\"",
+                "\n#r \"nuget:Systemorph.DataSetReader,1.5.2\"",
+                "\n#r \"nuget:Systemorph.DataSource,1.5.4\"",
+                "\n#r \"nuget:Systemorph.DataSource.Conversions,1.5.4\"",
+                "\n#r \"nuget:Systemorph.Reporting,1.5.7\""
             ]
         },
         {
@@ -71,6 +71,9 @@
                 "using System.ComponentModel.DataAnnotations;",
                 "\nusing System.ComponentModel.DataAnnotations.Schema;",
                 "\nusing Systemorph.Vertex.Grid.Model;",
+                "\nusing Systemorph.Vertex.Workspace;",
+                "\nusing Systemorph.Vertex.Activities;",
+                "\nusing Systemorph.Vertex.Import;",
                 "\nusing static Systemorph.Vertex.Arithmetics.ArithmeticOperations;"
             ]
         },
diff --git a/ifrs17/Export/ExportConfiguration.ipynb b/ifrs17/Export/ExportConfiguration.ipynb
index 6ce27a87..622371c3 100644
--- a/ifrs17/Export/ExportConfiguration.ipynb
+++ b/ifrs17/Export/ExportConfiguration.ipynb
@@ -29,6 +29,13 @@
                 "#!import \"../DataModel/DataStructure\""
             ]
         },
+        {
+            "cell_type": "code",
+            "source": [
+                "using Systemorph.Vertex.Export.Builders.Interfaces;",
+                "\nusing Systemorph.Vertex.Export.Excel.Builders.Interfaces;"
+            ]
+        },
         {
             "cell_type": "markdown",
             "source": [
diff --git a/ifrs17/Import/ImportStorage.ipynb b/ifrs17/Import/ImportStorage.ipynb
index 00ccbba0..41731861 100644
--- a/ifrs17/Import/ImportStorage.ipynb
+++ b/ifrs17/Import/ImportStorage.ipynb
@@ -132,7 +132,7 @@
                 "\n        ExperienceAdjustEstimateTypeMapping = new Dictionary<string,string>{{EstimateTypes.A, EstimateTypes.APA}, {EstimateTypes.AA, EstimateTypes.AAPA}, {EstimateTypes.OA, EstimateTypes.OAPA}}; //TODO move this logic",
                 "\n        ",
                 "\n        //Hierarchy Cache",
-                "\n        hierarchyCache.Initialize<AmountType>();",
+                "\n        await hierarchyCache.InitializeAsync<AmountType>();",
                 "\n        ",
                 "\n        //EstimateType to load and to update",
                 "\n        EstimateTypesByImportFormat = new InputSource[] { InputSource.Opening, InputSource.Actual, InputSource.Cashflow,}",
diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index d115059d..d3f3eacf 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -152,7 +152,7 @@
                 "\n        ",
                 "\n        //Hierarchy Cache",
                 "\n        HierarchyCache = workspace.ToHierarchicalDimensionCache();",
-                "\n        HierarchyCache.Initialize<AmountType>();",
+                "\n        await HierarchyCache.InitializeAsync<AmountType>();",
                 "\n    }",
                 "\n    ",
                 "\n    public async Task<Dictionary<string, string>> GetDimensionWithExternalIdDictionaryAsync<T> () where T : KeyedOrderedDimension",
diff --git a/ifrs17/Report/ReportConfigurationAndUtils.ipynb b/ifrs17/Report/ReportConfigurationAndUtils.ipynb
index 28b0acd6..43ecc78c 100644
--- a/ifrs17/Report/ReportConfigurationAndUtils.ipynb
+++ b/ifrs17/Report/ReportConfigurationAndUtils.ipynb
@@ -38,12 +38,12 @@
                 "\nusing System.Collections.Immutable;",
                 "\n",
                 "\npublic static DataCubeReportBuilder<IDataCube<TVariable>, TVariable, TVariable ,TVariable> ReportGridOptions<TVariable>(",
-                "\n    this DataCubePivotBuilder<IDataCube<TVariable>, TVariable, TVariable, TVariable> reportBuilder,",
+                "\n    this DataCubePivotBuilder<IDataCube<TVariable>, TVariable, TVariable, TVariable> pivotBuilder,",
                 "\n    int reportHeight = 700,",
                 "\n    int valueColumnWidth = 250,",
                 "\n    int headerColumnWidth = 250,",
                 "\n    int groupDefaultExpanded = 2)",
-                "\n    => reportBuilder.WithGridOptions(go => go",
+                "\n    => pivotBuilder.ToTable().WithOptions(go => go",
                 "\n                                     .WithColumns(cols => cols.Modify(\"Value\",c => c.WithWidth(valueColumnWidth).WithFormat(\"new Intl.NumberFormat('en',{ minimumFractionDigits:2, maximumFractionDigits:2 }).format(value)\")))",
                 "\n                                     .WithRows(rows => rows",
                 "\n                                               .Where(r => !(r.RowGroup.Coordinates.Last() == \"NullGroup\"))",
diff --git a/ifrs17/Report/ReportStorage.ipynb b/ifrs17/Report/ReportStorage.ipynb
index 13525d14..f71ce9e8 100644
--- a/ifrs17/Report/ReportStorage.ipynb
+++ b/ifrs17/Report/ReportStorage.ipynb
@@ -118,10 +118,10 @@
                 "\n    // Initializers",
                 "\n    public async Task InitializeReportIndependentCacheAsync() {",
                 "\n        // Hierarchical Dimensions",
-                "\n        hierarchicalDimensionCache.Initialize<LineOfBusiness>();",
-                "\n        hierarchicalDimensionCache.Initialize<AmountType>();  ",
-                "\n        hierarchicalDimensionCache.Initialize<VariableType>();",
-                "\n        hierarchicalDimensionCache.Initialize<ReportingNode>();",
+                "\n        await hierarchicalDimensionCache.InitializeAsync<LineOfBusiness>();",
+                "\n        await hierarchicalDimensionCache.InitializeAsync<AmountType>();  ",
+                "\n        await hierarchicalDimensionCache.InitializeAsync<VariableType>();",
+                "\n        await hierarchicalDimensionCache.InitializeAsync<ReportingNode>();",
                 "\n    }",
                 "\n    ",
                 "\n    public async Task InitializeAsync((int year, int month) period, string reportingNode, string scenario, CurrencyType currencyType) {",
diff --git a/ifrs17/Utils/TestHelper.ipynb b/ifrs17/Utils/TestHelper.ipynb
index 5946b2d9..741b3e11 100644
--- a/ifrs17/Utils/TestHelper.ipynb
+++ b/ifrs17/Utils/TestHelper.ipynb
@@ -107,7 +107,7 @@
                 "public static Systemorph.Vertex.Pivot.Reporting.Builder.ReportBuilder<IfrsVariable,IfrsVariable,IfrsVariable> WithGridOptionsForIfrsVariable",
                 "\n(this Systemorph.Vertex.Pivot.Builder.PivotBuilder<IfrsVariable,IfrsVariable,IfrsVariable> reportBuilder, int reportHeight = 650)",
                 "\n{",
-                "\n    return reportBuilder.WithGridOptions(go => ",
+                "\n    return reportBuilder.ToTable().WithOptions(go => ",
                 "\n        go.WithColumns(cols => cols.Modify(\"Value\", c => c.WithWidth(300)",
                 "\n                                   .WithFormat(\"new Intl.NumberFormat('en',{ minimumFractionDigits:2, maximumFractionDigits:2 }).format(value)\")))",
                 "\n          .WithRows(rows => rows.Where(r => !r.RowGroup.SystemName.EndsWith(\"NullGroup\")).ToList())",