diff --git a/ifrs17-template/Export/MapTemplate.ipynb b/ifrs17-template/Export/MapTemplate.ipynb
index a56e1ffe..532de56e 100644
--- a/ifrs17-template/Export/MapTemplate.ipynb
+++ b/ifrs17-template/Export/MapTemplate.ipynb
@@ -154,7 +154,7 @@
                 "\n    .PortfolioConfiguration<InsurancePortfolio>()",
                 "\n    .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
                 "\n    .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
-                "\n    .MainTabConfigurationWoScenario(partition)",
+                "\n    .MainTabConfiguration(partition)",
                 "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
             ],
             "metadata": {},
@@ -239,7 +239,7 @@
                 "\n    .WithSource(Workspace)",
                 "\n    .StateEnumConfiguration() ",
                 "\n    .DataNodeStateConfiguration(dataNodeStates)",
-                "\n    .MainTabConfigurationWoScenario(partition)",
+                "\n    .MainTabConfiguration(partition)",
                 "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
             ],
             "metadata": {},
diff --git a/ifrs17-template/Test/MapTemplateAndImportTest.ipynb b/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
index 95e7e89a..6adc4569 100644
--- a/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
+++ b/ifrs17-template/Test/MapTemplateAndImportTest.ipynb
@@ -165,7 +165,7 @@
                 "\n    .PortfolioConfiguration<InsurancePortfolio>()",
                 "\n    .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
                 "\n    .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
-                "\n    .MainTabConfigurationWoScenario(partition)",
+                "\n    .MainTabConfiguration(partition)",
                 "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
                 "\n",
                 "\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
@@ -183,7 +183,7 @@
                 "\n    .PortfolioConfiguration<InsurancePortfolio>()",
                 "\n    .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
                 "\n    .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
-                "\n    .MainTabConfigurationWoScenario(partition)",
+                "\n    .MainTabConfiguration(partition)",
                 "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
             ],
             "metadata": {},
@@ -264,7 +264,7 @@
                 "\n    .WithSource(Workspace)",
                 "\n    .StateEnumConfiguration() ",
                 "\n    .DataNodeStateConfiguration(dataNodeStates)",
-                "\n    .MainTabConfigurationWoScenario(partition)",
+                "\n    .MainTabConfiguration(partition)",
                 "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader);",
                 "\n",
                 "\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
@@ -280,7 +280,7 @@
                 "\n    .WithSource(Workspace)",
                 "\n    .StateEnumConfiguration() ",
                 "\n    .DataNodeStateConfiguration(dataNodeStates)",
-                "\n    .MainTabConfigurationWoScenario(partition)",
+                "\n    .MainTabConfiguration(partition)",
                 "\n    .ExecuteWithStoreActivityAsync(Session, DataSource, DataSetReader)"
             ],
             "metadata": {},
diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index 46802a93..d3e0e1e0 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -1151,7 +1151,6 @@
                 "\n    public string Scenario { get; init; }",
                 "\n",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 37)]",
                 "\n    public string Name { get; init; }",
                 "\n    ",
                 "\n    [Conversion(typeof(PrimitiveArrayConverter))]",
@@ -1232,6 +1231,7 @@
                 "\n    [Required]",
                 "\n    [Dimension(typeof(ReportingNode))]",
                 "\n    [IdentityProperty]",
+                "\n    [Display(Order = 10)]",
                 "\n    public string ReportingNode { get; init; }",
                 "\n}"
             ],
@@ -1272,15 +1272,17 @@
                 "public record PartitionByReportingNodeAndPeriod : IfrsPartition {",
                 "\n    [Dimension(typeof(int), nameof(Year))]",
                 "\n    [IdentityProperty]",
+                "\n    [Display(Order = 20)]",
                 "\n    public int Year { get; init; }",
                 "\n",
                 "\n    [Dimension(typeof(int), nameof(Month))]",
                 "\n    [IdentityProperty]",
+                "\n    [Display(Order = 30)]",
                 "\n    public int Month { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 50)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    [IdentityProperty]",
+                "\n    [Display(Order = 40)]",
                 "\n    public string Scenario { get; init; }",
                 "\n}"
             ],
@@ -1502,7 +1504,6 @@
                 "\n    ",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(GroupOfContract))]",
                 "\n    public string DataNode { get; init; }",
                 "\n    ",
@@ -1511,7 +1512,6 @@
                 "\n    [NoArithmetics(ArithmeticOperation.Scale)]",
                 "\n    [Dimension(typeof(int), nameof(Year))]",
                 "\n    [Range(1900, 2100, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
-                "\n    [Display(Order = 20)]",
                 "\n    public int Year { get; init; }",
                 "\n    ",
                 "\n    [Required]",
@@ -1519,17 +1519,14 @@
                 "\n    [NoArithmetics(ArithmeticOperation.Scale)]",
                 "\n    [Dimension(typeof(int), nameof(Month))]",
                 "\n    [Range(1, 12, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
-                "\n    [Display(Order = 30)]",
                 "\n    [DefaultValue(DefaultDataNodeActivationMonth)]",
                 "\n    public int Month { get; init; } = DefaultDataNodeActivationMonth;",
                 "\n    ",
                 "\n    [Required]",
-                "\n    [Display(Order = 40)]",
                 "\n    [DefaultValue(State.Active)]",
                 "\n    public State State { get; init; } = State.Active;",
                 "\n",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 50)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    public string Scenario { get; init; }",
                 "\n}"
@@ -1568,7 +1565,6 @@
                 "\n    [NoArithmetics(ArithmeticOperation.Scale)]",
                 "\n    [Dimension(typeof(int), nameof(Year))]",
                 "\n    [Range(1900, 2100, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
-                "\n    [Display(Order = 20)]",
                 "\n    public int Year { get; init; }",
                 "\n    ",
                 "\n    [Required]",
@@ -1576,18 +1572,15 @@
                 "\n    [NoArithmetics(ArithmeticOperation.Scale)]",
                 "\n    [Dimension(typeof(int), nameof(Month))]",
                 "\n    [Range(1, 12, ErrorMessage = \"Value for {0} must be between {1} and {2}.\")]",
-                "\n    [Display(Order = 30)]",
                 "\n    [DefaultValue(DefaultDataNodeActivationMonth)]",
                 "\n    public int Month { get; init; } = DefaultDataNodeActivationMonth;",
                 "\n        ",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(GroupOfContract))]",
                 "\n    public string DataNode { get; init; }",
                 "\n",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 40)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    public string Scenario { get; init; }",
                 "\n}"
@@ -1608,7 +1601,6 @@
                 "\npublic record InterDataNodeParameter : DataNodeParameter {",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(GroupOfContract))]",
                 "\n    public string LinkedDataNode { get; init; }",
                 "\n    ",
diff --git a/ifrs17/Export/ExportConfiguration.ipynb b/ifrs17/Export/ExportConfiguration.ipynb
index 8eb90368..1b94ed00 100644
--- a/ifrs17/Export/ExportConfiguration.ipynb
+++ b/ifrs17/Export/ExportConfiguration.ipynb
@@ -62,19 +62,6 @@
             "execution_count": 0,
             "outputs": []
         },
-        {
-            "cell_type": "code",
-            "source": [
-                "public static IDocumentBuilder MainTabConfigurationWoScenario<T>(this IDocumentBuilder builder, T args) where T : IfrsPartition",
-                "\n    => builder.WithTable<T>( config => config .AtBeginning() ",
-                "\n        .WithName(Main) ",
-                "\n        .WithSource(source => args.RepeatOnce().AsQueryable()) ",
-                "\n        .WithColumn(x => x.Id, x => x.Delete()));"
-            ],
-            "metadata": {},
-            "execution_count": 0,
-            "outputs": []
-        },
         {
             "cell_type": "code",
             "source": [
@@ -197,6 +184,7 @@
                 "\n            .WithColumn(x => x.Month, x => x.Delete())",
                 "\n            .WithColumn(x => x.Year, x => x.Delete())",
                 "\n            .WithColumn(x => x.Id, x => x.Delete())",
+                "\n            .WithColumn(x => x.Scenario, x => x.Delete())",
                 "\n            .WithColumn(x => x.State, y => y.WithDataValidation(z => z.WithReferenceTo<HelperState, string>(t => t.State)))",
                 "\n        );"
             ],
@@ -250,6 +238,7 @@
                 "\n            .WithColumn(x => x.Partition, x => x.Delete())",
                 "\n            .WithColumn(x => x.Month, x => x.Delete())",
                 "\n            .WithColumn(x => x.Id, x => x.Delete())",
+                "\n            .WithColumn(x => x.Scenario, x => x.Delete())",
                 "\n            .WithColumn(x => x.Year, x => x.Delete())",
                 "\n        )",
                 "\n        .WithTable<SingleDataNodeParameter>(config => config       ",
@@ -261,6 +250,7 @@
                 "\n            .WithColumn(x => x.Year, x => x.Delete())",
                 "\n            .WithColumn(x => x.Year, x => x.Delete())",
                 "\n            .WithColumn(x => x.Id, x => x.Delete())",
+                "\n            .WithColumn(x => x.Scenario, x => x.Delete())",
                 "\n        );"
             ],
             "metadata": {},