diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index 79f3dd04..cb1b8cfd 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -289,10 +289,8 @@
                 "\n    [Key]",
                 "\n    [IdentityProperty]",
                 "\n    [StringLength(16)]",
-                "\n    [Display(Order = 1)]",
                 "\n    public string SystemName { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 2)]",
                 "\n    [NotVisible]",
                 "\n    public string DisplayName { get; init; }",
                 "\n}"
@@ -317,7 +315,6 @@
             "cell_type": "code",
             "source": [
                 "public abstract record KeyedOrderedDimensionWithExternalId : KeyedOrderedDimension {",
-                "\n    [Display(Order = 100)]",
                 "\n    [Conversion(typeof(JsonConverter<string[]>))]",
                 "\n    public string[] ExternalId { get; init; }",
                 "\n}"
@@ -394,11 +391,9 @@
             "source": [
                 "public record AmountType : KeyedOrderedDimensionWithExternalId, IHierarchicalDimension",
                 "\n{",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(AmountType))]",
                 "\n    public string Parent { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 20)]",
                 "\n    [Dimension(typeof(PeriodType))]",
                 "\n    public PeriodType PeriodType { get; init; }",
                 "\n}"
@@ -444,7 +439,6 @@
             "source": [
                 "public record RiskDriver : KeyedOrderedDimension, IHierarchicalDimension",
                 "\n{",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(RiskDriver))]",
                 "\n    public string Parent { get; init; }",
                 "\n}"
@@ -470,10 +464,8 @@
             "source": [
                 "public record EstimateType : KeyedOrderedDimensionWithExternalId",
                 "\n{",
-                "\n    [Display(Order = 110)]",
                 "\n    public InputSource InputSource { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 120)]",
                 "\n    public StructureType StructureType { get; init; }",
                 "\n",
                 "\n    [Dimension(typeof(PeriodType))]",
@@ -520,7 +512,6 @@
             "source": [
                 "public record VariableType : KeyedOrderedDimension, IHierarchicalDimension",
                 "\n{    ",
-                "\n    [Display(Order = 10)]",
                 "\n    public string Parent { get; init; }",
                 "\n}"
             ],
@@ -552,7 +543,6 @@
             "source": [
                 "public record AocType : VariableType",
                 "\n{    ",
-                "\n    [Display(Order = 30)]",
                 "\n    [Dimension(typeof(AocType))]",
                 "\n    public string Parent { get; init; }",
                 "\n}"
@@ -685,7 +675,6 @@
             "source": [
                 "public record LineOfBusiness : KeyedOrderedDimension, IHierarchicalDimension",
                 "\n{",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(LineOfBusiness))]",
                 "\n    public string Parent { get; init; }",
                 "\n}"
@@ -780,7 +769,6 @@
             "source": [
                 "public record LiabilityType  : KeyedDimension, IHierarchicalDimension",
                 "\n{",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(LiabilityType))]",
                 "\n    public string Parent { get; init; }",
                 "\n}"
@@ -894,12 +882,10 @@
             "source": [
                 "public record ReportingNode : KeyedDimension, IHierarchicalDimension ",
                 "\n{",
-                "\n    [Display(Order = 20)]",
                 "\n    [Dimension(typeof(ReportingNode))]",
                 "\n    public string Parent { get; init; }",
                 "\n    ",
                 "\n    [Required]",
-                "\n    [Display(Order = 40)]",
                 "\n    [Dimension(typeof(Currency))]",
                 "\n    public virtual string Currency { get; init; }",
                 "\n}"
@@ -996,7 +982,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 = 10)]",
                 "\n    public int Year { get; init; }",
                 "\n    ",
                 "\n    [Required]",
@@ -1004,44 +989,34 @@
                 "\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 = 20)]",
                 "\n    public int Month { get; init; }",
                 "\n    ",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 30)]",
                 "\n    [Dimension(typeof(AocType))]",
                 "\n    public string AocType { get; init; }",
                 "\n    ",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 40)]",
                 "\n    [Dimension(typeof(Novelty))]",
                 "\n    public string Novelty { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 50)]",
                 "\n    [Dimension(typeof(DataType))]",
                 "\n    public DataType DataType { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 55)]",
                 "\n    [Dimension(typeof(InputSource))]",
                 "\n    public InputSource InputSource { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 60)]",
                 "\n    [Dimension(typeof(FxPeriod))]",
                 "\n    public FxPeriod FxPeriod { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 70)]",
                 "\n    [Dimension(typeof(PeriodType), nameof(YcPeriod))]",
                 "\n    public PeriodType YcPeriod { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 80)]",
                 "\n    [Dimension(typeof(PeriodType), nameof(CdrPeriod))]",
                 "\n    public PeriodType CdrPeriod { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 90)]",
                 "\n    [Dimension(typeof(ValuationPeriod))]",
                 "\n    public ValuationPeriod ValuationPeriod { get; init; }",
                 "\n    ",
-                "\n    [Display(Order = 100)]",
                 "\n    [Dimension(typeof(PeriodType), nameof(RcPeriod))]",
                 "\n    public PeriodType RcPeriod { get; init; }",
                 "\n    ",
@@ -1073,7 +1048,6 @@
                 "\n{    ",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(Currency))]",
                 "\n    public string Currency { get; init; }",
                 "\n",
@@ -1082,7 +1056,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]",
@@ -1090,19 +1063,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    public int Month { get; init; }",
                 "\n",
                 "\n    [IdentityProperty]",
                 "\n    [Required]",
-                "\n    [Display(Order = 40)]",
                 "\n    public FxType FxType { get; init; }",
                 "\n",
-                "\n    [Display(Order = 50)]",
                 "\n    public double FxToGroupCurrency { get; init; }",
                 "\n",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 60)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    public string Scenario { get; init; }",
                 "\n}"
@@ -1133,7 +1102,6 @@
                 "\n{    ",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(CreditRiskRating))]",
                 "\n    public string CreditRiskRating { get; init; }",
                 "\n",
@@ -1142,7 +1110,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]",
@@ -1150,15 +1117,12 @@
                 "\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    public int Month { get; init; }",
                 "\n    ",
                 "\n    [Conversion(typeof(PrimitiveArrayConverter))]",
-                "\n    [Display(Order = 40)]",
                 "\n    public double[] Values { get; init; }",
                 "\n",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 50)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    public string Scenario { get; init; }",
                 "\n}"
@@ -1190,7 +1154,6 @@
                 "\n{    ",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(Currency))]",
                 "\n    public string Currency { get; init; }",
                 "\n",
@@ -1199,7 +1162,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]",
@@ -1207,16 +1169,13 @@
                 "\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    public int Month { get; init; }",
                 "\n",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 35)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    public string Scenario { get; init; }",
                 "\n",
                 "\n    [Conversion(typeof(PrimitiveArrayConverter))]",
-                "\n    [Display(Order = 40)]",
                 "\n    public double[] Values { get; init; }",
                 "\n}"
             ],
@@ -1242,12 +1201,10 @@
                 "\n{    ",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(Partner))]",
                 "\n    public string Partner { get; init; }",
                 "\n",
                 "\n    [Required]",
-                "\n    [Display(Order = 20)]",
                 "\n    [Dimension(typeof(CreditRiskRating))]",
                 "\n    public string CreditRiskRating { get; init; }",
                 "\n",
@@ -1256,7 +1213,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 = 30)]",
                 "\n    public int Year { get; init; }",
                 "\n    ",
                 "\n    [Required]",
@@ -1264,11 +1220,9 @@
                 "\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 = 40)]",
                 "\n    public int Month { get; init; }",
                 "\n",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 50)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    public string Scenario { get; init; }",
                 "\n}"
@@ -1297,12 +1251,10 @@
                 "\n    public Guid Id { get; init; }",
                 "\n",
                 "\n    [Required]",
-                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(ReportingNode))]",
                 "\n    [IdentityProperty]",
                 "\n    public string ReportingNode { get; init; }",
                 "\n",
-                "\n    [Display(Order = 50)]",
                 "\n    [Dimension(typeof(Scenario))]",
                 "\n    [IdentityProperty]",
                 "\n    public string Scenario { get; init; }",
@@ -1343,12 +1295,10 @@
             "cell_type": "code",
             "source": [
                 "public record PartitionByReportingNodeAndPeriod : IfrsPartition {",
-                "\n    [Display(Order = 30)]",
                 "\n    [Dimension(typeof(int), nameof(Year))]",
                 "\n    [IdentityProperty]",
                 "\n    public int Year { get; init; }",
                 "\n",
-                "\n    [Display(Order = 40)]",
                 "\n    [Dimension(typeof(int), nameof(Month))]",
                 "\n    [IdentityProperty]",
                 "\n    public int Month { get; init; }",
@@ -1674,7 +1624,7 @@
                 "\npublic record InterDataNodeParameter : DataNodeParameter {",
                 "\n    [Required]",
                 "\n    [IdentityProperty]",
-                "\n    [Display(Order = 20)]",
+                "\n    [Display(Order = 10)]",
                 "\n    [Dimension(typeof(GroupOfContract))]",
                 "\n    public string LinkedDataNode { get; init; }",
                 "\n    ",