diff --git a/blazorbootstrap/Models/Charts/ChartDataset/BarChart/BarChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/BarChart/BarChartDataset.cs
index ab5176b25..441930f61 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/BarChart/BarChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/BarChart/BarChartDataset.cs
@@ -1,12 +1,12 @@
 namespace BlazorBootstrap;
 
 /// <summary>
-/// The bar chart allows a number of properties to be specified for each dataset. 
+/// The bar chart allows a number of properties to be specified for each dataset.
 /// These are used to set display properties for a specific dataset.
 /// <see href="https://www.chartjs.org/docs/latest/charts/bar.html#dataset-properties" />
 /// <seealso href="https://www.chartjs.org/docs/latest/charts/bar.html#general" />
 /// </summary>
-public class BarChartDataset : ChartDataset
+public class BarChartDataset : ChartDataset<double?>
 {
     #region Properties, Indexers
 
@@ -29,11 +29,11 @@ public class BarChartDataset : ChartDataset
     public double BarPercentage { get; set; } = 0.9;
 
     /// <summary>
-    /// It is applied to the width of each bar, in pixels. 
+    /// It is applied to the width of each bar, in pixels.
     /// When this is enforced, barPercentage and categoryPercentage are ignored.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? BarThickness { get; set; }
@@ -75,25 +75,17 @@ public class BarChartDataset : ChartDataset
     /// </remarks>
     public double CategoryPercentage { get; set; } = 0.8;
 
-    /// <summary>
-    /// Get or sets the Data.
-    /// </summary>
-    /// <remarks>
-    /// Default value is <see langword="null"/>.
-    /// </remarks>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public new List<double?>? Data { get; set; }
-
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] 
     public BarChartDatasetDataLabels Datalabels { get; set; } = new(); // TODO: add the reference link
 
     /// <summary>
-    /// Should the bars be grouped on index axis. 
-    /// When <see langword="true"/>, all the datasets at same index value will be placed next to each other centering on that index value. 
-    /// When <see langword="false"/>, each bar is placed on its actual index-axis value.
+    /// Should the bars be grouped on index axis.
+    /// When <see langword="true" />, all the datasets at same index value will be placed next to each other centering on that
+    /// index value.
+    /// When <see langword="false" />, each bar is placed on its actual index-axis value.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="true"/>.
+    /// Default value is <see langword="true" />.
     /// </remarks>
     public bool Grouped { get; set; } = true;
 
@@ -101,7 +93,7 @@ public class BarChartDataset : ChartDataset
     /// The bar background color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBackgroundColor { get; set; }
@@ -110,7 +102,7 @@ public class BarChartDataset : ChartDataset
     /// The bar border color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBorderColor { get; set; }
@@ -138,7 +130,7 @@ public class BarChartDataset : ChartDataset
     /// Supported values are 'x' and 'y'.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? IndexAxis { get; set; }
@@ -150,7 +142,7 @@ public class BarChartDataset : ChartDataset
     /// Set this to ensure that bars are not sized thicker than this.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? MaxBarThickness { get; set; }
@@ -159,7 +151,7 @@ public class BarChartDataset : ChartDataset
     /// Set this to ensure that bars have a minimum length in pixels.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? MinBarLength { get; set; }
@@ -168,10 +160,11 @@ public class BarChartDataset : ChartDataset
     //https://www.chartjs.org/docs/latest/configuration/elements.html#point-styles
 
     /// <summary>
-    /// If <see langword="true"/>, null or undefined values will not be used for spacing calculations when determining bar size.
+    /// If <see langword="true" />, null or undefined values will not be used for spacing calculations when determining bar
+    /// size.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="false"/>.
+    /// Default value is <see langword="false" />.
     /// </remarks>
     public bool SkipNull { get; set; }
 
@@ -199,6 +192,4 @@ public class BarChartDataset : ChartDataset
     #endregion
 }
 
-public class BarChartDatasetDataLabels : ChartDatasetDataLabels
-{
-}
+public class BarChartDatasetDataLabels : ChartDatasetDataLabels { }
diff --git a/blazorbootstrap/Models/Charts/ChartDataset/ChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/ChartDataset.cs
index b149117bf..fb768abeb 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/ChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/ChartDataset.cs
@@ -5,7 +5,7 @@ public interface IChartDataset { }
 /// <summary>
 /// <See href="https://www.chartjs.org/docs/latest/general/data-structures.html#dataset-configuration" />
 /// </summary>
-public class ChartDataset : IChartDataset
+public class ChartDataset<TData> : IChartDataset
 {
     #region Constructors
 
@@ -24,7 +24,7 @@ public ChartDataset()
     /// Clipping can also be configured per side: clip: {left: 5, top: false, right: -2, bottom: 0}
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Clip { get; set; }
@@ -33,16 +33,16 @@ public ChartDataset()
     /// Get or sets the Data.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public object Data { get; set; }
+    public List<TData>? Data { get; set; }
 
     /// <summary>
-    /// Configures the visibility state of the dataset. Set it to <see langword="true"/>, to hide the dataset from the chart.
+    /// Configures the visibility state of the dataset. Set it to <see langword="true" />, to hide the dataset from the chart.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="false"/>.
+    /// Default value is <see langword="false" />.
     /// </remarks>
     public bool Hidden { get; set; }
 
@@ -75,7 +75,7 @@ public ChartDataset()
     /// Gets or sets the chart type.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Type { get; protected set; }
diff --git a/blazorbootstrap/Models/Charts/ChartDataset/DoughnutChart/DoughnutChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/DoughnutChart/DoughnutChartDataset.cs
index 4dc7f7d91..a6554bff5 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/DoughnutChart/DoughnutChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/DoughnutChart/DoughnutChartDataset.cs
@@ -1,11 +1,11 @@
 namespace BlazorBootstrap;
 
 /// <summary>
-/// The doughnut/pie chart allows a number of properties to be specified for each dataset. 
+/// The doughnut/pie chart allows a number of properties to be specified for each dataset.
 /// These are used to set display properties for a specific dataset.
 /// <see href="https://www.chartjs.org/docs/latest/charts/doughnut.html#dataset-properties" />.
 /// </summary>
-public class DoughnutChartDataset : ChartDataset
+public class DoughnutChartDataset : ChartDataset<double?>
 {
     #region Properties, Indexers
 
@@ -20,7 +20,7 @@ public class DoughnutChartDataset : ChartDataset
 
     /// <summary>
     /// Supported values are 'center' and 'inner'.
-    /// When 'center' is set, the borders of arcs next to each other will overlap. 
+    /// When 'center' is set, the borders of arcs next to each other will overlap.
     /// When 'inner' is set, it is guaranteed that all borders will not overlap.
     /// </summary>
     /// <remarks>
@@ -42,7 +42,7 @@ public class DoughnutChartDataset : ChartDataset
     /// Arc border length and spacing of dashes.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? BorderDash { get; set; }
@@ -60,7 +60,7 @@ public class DoughnutChartDataset : ChartDataset
     /// Supported values are 'round', 'bevel', 'miter'.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? BorderJoinStyle { get; set; } // TODO: change this to enum
@@ -87,20 +87,11 @@ public class DoughnutChartDataset : ChartDataset
     /// Per-dataset override for the sweep that the arcs cover.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? Circumference { get; set; }
 
-    /// <summary>
-    /// Get or sets the Data.
-    /// </summary>
-    /// <remarks>
-    /// Default value is <see langword="null"/>.
-    /// </remarks>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public new List<double?>? Data { get; set; }
-
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] 
     public DoughnutChartDatasetDataLabels Datalabels { get; set; } = new(); // TODO: add the reference link
 
@@ -108,7 +99,7 @@ public class DoughnutChartDataset : ChartDataset
     /// Arc background color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBackgroundColor { get; set; }
@@ -117,16 +108,16 @@ public class DoughnutChartDataset : ChartDataset
     /// Arc border color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBorderColor { get; set; }
 
     /// <summary>
-    /// Arc border length and spacing of dashes when hovered. 
+    /// Arc border length and spacing of dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderDash { get; set; }
@@ -135,7 +126,7 @@ public class DoughnutChartDataset : ChartDataset
     /// Arc border offset for line dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? HoverBorderDashOffset { get; set; }
@@ -145,7 +136,7 @@ public class DoughnutChartDataset : ChartDataset
     /// Supported values are 'round', 'bevel', 'miter'.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBorderJoinStyle { get; set; } // TODO: change this to enum
@@ -154,7 +145,7 @@ public class DoughnutChartDataset : ChartDataset
     /// Arc border width when hovered (in pixels).
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderWidth { get; set; }
@@ -181,7 +172,7 @@ public class DoughnutChartDataset : ChartDataset
     /// Per-dataset override for the starting angle to draw arcs from.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? Rotation { get; set; }
@@ -195,8 +186,8 @@ public class DoughnutChartDataset : ChartDataset
     public double Spacing { get; set; }
 
     /// <summary>
-    /// The relative thickness of the dataset. 
-    /// Providing a value for weight will cause the pie or doughnut dataset to be drawn 
+    /// The relative thickness of the dataset.
+    /// Providing a value for weight will cause the pie or doughnut dataset to be drawn
     /// with a thickness relative to the sum of all the dataset weight values.
     /// </summary>
     /// <remarks>
@@ -207,6 +198,4 @@ public class DoughnutChartDataset : ChartDataset
     #endregion
 }
 
-public class DoughnutChartDatasetDataLabels : ChartDatasetDataLabels
-{
-}
+public class DoughnutChartDatasetDataLabels : ChartDatasetDataLabels { }
diff --git a/blazorbootstrap/Models/Charts/ChartDataset/LineChart/LineChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/LineChart/LineChartDataset.cs
index 5eb09f5a2..8c035851b 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/LineChart/LineChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/LineChart/LineChartDataset.cs
@@ -5,7 +5,7 @@
 /// These are used to set display properties for a specific dataset.
 /// <see href="https://www.chartjs.org/docs/latest/charts/line.html#dataset-properties" />.
 /// </summary>
-public class LineChartDataset : ChartDataset
+public class LineChartDataset : ChartDataset<double?>
 {
     #region Methods
 
@@ -188,17 +188,9 @@ public LineChartDataset FillToValue(double value)
     /// Default value is 'default'.
     /// </remarks>
     public string CubicInterpolationMode { get; set; } = "default";
-
-    /// <summary>
-    /// Get or sets the Data.
-    /// </summary>
-    /// <remarks>
-    /// Default value is <see langword="null" />.
-    /// </remarks>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public new List<double?>? Data { get; set; }
-
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public LineChartDatasetDataLabels Datalabels { get; set; } = new(); // TODO: add the reference link
+    
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] 
+    public LineChartDatasetDataLabels Datalabels { get; set; } = new(); // TODO: add the reference link
 
     /// <summary>
     /// Draw the active points of a dataset over the other points of the dataset.
diff --git a/blazorbootstrap/Models/Charts/ChartDataset/PieChart/PieChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/PieChart/PieChartDataset.cs
index 2d39b83a4..80f91271c 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/PieChart/PieChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/PieChart/PieChartDataset.cs
@@ -1,11 +1,11 @@
 namespace BlazorBootstrap;
 
 /// <summary>
-/// The doughnut/pie chart allows a number of properties to be specified for each dataset. 
+/// The doughnut/pie chart allows a number of properties to be specified for each dataset.
 /// These are used to set display properties for a specific dataset.
 /// <see href="https://www.chartjs.org/docs/latest/charts/doughnut.html#dataset-properties" />.
 /// </summary>
-public class PieChartDataset : ChartDataset
+public class PieChartDataset : ChartDataset<double?>
 {
     #region Properties, Indexers
 
@@ -20,7 +20,7 @@ public class PieChartDataset : ChartDataset
 
     /// <summary>
     /// Supported values are 'center' and 'inner'.
-    /// When 'center' is set, the borders of arcs next to each other will overlap. 
+    /// When 'center' is set, the borders of arcs next to each other will overlap.
     /// When 'inner' is set, it is guaranteed that all borders will not overlap.
     /// </summary>
     /// <remarks>
@@ -42,7 +42,7 @@ public class PieChartDataset : ChartDataset
     /// Arc border length and spacing of dashes.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? BorderDash { get; set; }
@@ -60,7 +60,7 @@ public class PieChartDataset : ChartDataset
     /// Supported values are 'round', 'bevel', 'miter'.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? BorderJoinStyle { get; set; } // TODO: change this to enum
@@ -87,20 +87,11 @@ public class PieChartDataset : ChartDataset
     /// Per-dataset override for the sweep that the arcs cover.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? Circumference { get; set; }
 
-    /// <summary>
-    /// Get or sets the Data.
-    /// </summary>
-    /// <remarks>
-    /// Default value is <see langword="null"/>.
-    /// </remarks>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public new List<double?>? Data { get; set; }
-
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] 
     public PieChartDatasetDataLabels Datalabels { get; set; } = new(); // TODO: add the reference link
 
@@ -108,7 +99,7 @@ public class PieChartDataset : ChartDataset
     /// Arc background color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBackgroundColor { get; set; }
@@ -117,16 +108,16 @@ public class PieChartDataset : ChartDataset
     /// Arc border color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBorderColor { get; set; }
 
     /// <summary>
-    /// Arc border length and spacing of dashes when hovered. 
+    /// Arc border length and spacing of dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderDash { get; set; }
@@ -135,7 +126,7 @@ public class PieChartDataset : ChartDataset
     /// Arc border offset for line dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? HoverBorderDashOffset { get; set; }
@@ -145,7 +136,7 @@ public class PieChartDataset : ChartDataset
     /// Supported values are 'round', 'bevel', 'miter'.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBorderJoinStyle { get; set; } // TODO: change this to enum
@@ -154,7 +145,7 @@ public class PieChartDataset : ChartDataset
     /// Arc border width when hovered (in pixels).
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderWidth { get; set; }
@@ -181,7 +172,7 @@ public class PieChartDataset : ChartDataset
     /// Per-dataset override for the starting angle to draw arcs from.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? Rotation { get; set; }
@@ -195,8 +186,8 @@ public class PieChartDataset : ChartDataset
     public double Spacing { get; set; }
 
     /// <summary>
-    /// The relative thickness of the dataset. 
-    /// Providing a value for weight will cause the pie or doughnut dataset to be drawn 
+    /// The relative thickness of the dataset.
+    /// Providing a value for weight will cause the pie or doughnut dataset to be drawn
     /// with a thickness relative to the sum of all the dataset weight values.
     /// </summary>
     /// <remarks>
@@ -207,6 +198,4 @@ public class PieChartDataset : ChartDataset
     #endregion
 }
 
-public class PieChartDatasetDataLabels : ChartDatasetDataLabels
-{
-}
+public class PieChartDatasetDataLabels : ChartDatasetDataLabels { }
diff --git a/blazorbootstrap/Models/Charts/ChartDataset/PolarAreaChart/PolarAreaChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/PolarAreaChart/PolarAreaChartDataset.cs
index feb137587..dc749cad6 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/PolarAreaChart/PolarAreaChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/PolarAreaChart/PolarAreaChartDataset.cs
@@ -1,6 +1,6 @@
 namespace BlazorBootstrap;
 
-public class PolarAreaChartDataset : ChartDataset
+public class PolarAreaChartDataset : ChartDataset<double?>
 {
     #region Properties, Indexers
 
@@ -15,7 +15,7 @@ public class PolarAreaChartDataset : ChartDataset
 
     /// <summary>
     /// Supported values are 'center' and 'inner'.
-    /// When 'center' is set, the borders of arcs next to each other will overlap. 
+    /// When 'center' is set, the borders of arcs next to each other will overlap.
     /// When 'inner' is set, it is guaranteed that all borders will not overlap.
     /// </summary>
     /// <remarks>
@@ -37,7 +37,7 @@ public class PolarAreaChartDataset : ChartDataset
     /// Arc border length and spacing of dashes.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? BorderDash { get; set; }
@@ -55,7 +55,7 @@ public class PolarAreaChartDataset : ChartDataset
     /// Supported values are 'round', 'bevel', 'miter'.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? BorderJoinStyle { get; set; } // TODO: change this to enum
@@ -70,22 +70,13 @@ public class PolarAreaChartDataset : ChartDataset
     public List<double>? BorderWidth { get; set; }
 
     /// <summary>
-    /// By default the Arc is curved. If <see langword="false"/>, the Arc will be flat.
+    /// By default the Arc is curved. If <see langword="false" />, the Arc will be flat.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="true"/>.
+    /// Default value is <see langword="true" />.
     /// </remarks>
     public bool Circular { get; set; } = true;
 
-    /// <summary>
-    /// Get or sets the Data.
-    /// </summary>
-    /// <remarks>
-    /// Default value is <see langword="null"/>.
-    /// </remarks>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public new List<double?>? Data { get; set; }
-
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] 
     public PieChartDatasetDataLabels Datalabels { get; set; } = new();
 
@@ -93,7 +84,7 @@ public class PolarAreaChartDataset : ChartDataset
     /// Arc background color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBackgroundColor { get; set; }
@@ -102,16 +93,16 @@ public class PolarAreaChartDataset : ChartDataset
     /// Arc border color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBorderColor { get; set; }
 
     /// <summary>
-    /// Arc border length and spacing of dashes when hovered. 
+    /// Arc border length and spacing of dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderDash { get; set; }
@@ -120,7 +111,7 @@ public class PolarAreaChartDataset : ChartDataset
     /// Arc border offset for line dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? HoverBorderDashOffset { get; set; }
@@ -130,7 +121,7 @@ public class PolarAreaChartDataset : ChartDataset
     /// Supported values are 'round', 'bevel', 'miter'.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? HoverBorderJoinStyle { get; set; } // TODO: change this to enum
@@ -139,7 +130,7 @@ public class PolarAreaChartDataset : ChartDataset
     /// Arc border width when hovered (in pixels).
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderWidth { get; set; }
@@ -147,6 +138,4 @@ public class PolarAreaChartDataset : ChartDataset
     #endregion
 }
 
-public class PolarAreaChartDatasetDataLabels : ChartDatasetDataLabels
-{
-}
+public class PolarAreaChartDatasetDataLabels : ChartDatasetDataLabels { }
diff --git a/blazorbootstrap/Models/Charts/ChartDataset/RadarChart/RadarChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/RadarChart/RadarChartDataset.cs
index bdae10aca..58655626d 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/RadarChart/RadarChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/RadarChart/RadarChartDataset.cs
@@ -5,7 +5,7 @@
 /// They are often useful for comparing the points of two or more different data sets.
 /// <see href="https://www.chartjs.org/docs/latest/charts/radar.html#dataset-properties" />.
 /// </summary>
-public class RadarChartDataset : ChartDataset
+public class RadarChartDataset : ChartDataset<double?>
 {
     #region Properties, Indexers
 
@@ -38,7 +38,7 @@ public class RadarChartDataset : ChartDataset
     /// Gets or sets the length and spacing of dashes.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? BorderDash { get; set; }
@@ -52,7 +52,7 @@ public class RadarChartDataset : ChartDataset
     public double BorderDashOffset { get; set; }
 
     /// <summary>
-    /// Line joint style. 
+    /// Line joint style.
     /// There are three possible values for this property: 'round', 'bevel', and 'miter'.
     /// </summary>
     /// <remarks>
@@ -68,23 +68,14 @@ public class RadarChartDataset : ChartDataset
     /// </remarks>
     public double BorderWidth { get; set; } = 3;
 
-    /// <summary>
-    /// Get or sets the Data.
-    /// </summary>
-    /// <remarks>
-    /// Default value is <see langword="null"/>.
-    /// </remarks>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public new List<double?>? Data { get; set; }
-
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] 
     public RadarChartDatasetDataLabels Datalabels { get; set; } = new(); // TODO: Add reference link
 
     /// <summary>
     /// How to fill the area under the line.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="false"/>.
+    /// Default value is <see langword="false" />.
     /// </remarks>
     public bool Fill { get; set; }
 
@@ -92,7 +83,7 @@ public class RadarChartDataset : ChartDataset
     /// The line fill color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? HoverBackgroundColor { get; set; }
@@ -101,7 +92,7 @@ public class RadarChartDataset : ChartDataset
     /// Cap style of the line when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? HoverBorderCapStyle { get; set; }
@@ -110,7 +101,7 @@ public class RadarChartDataset : ChartDataset
     /// The line color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? HoverBorderColor { get; set; }
@@ -119,7 +110,7 @@ public class RadarChartDataset : ChartDataset
     /// Gets or sets the length and spacing of dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderDash { get; set; }
@@ -128,13 +119,13 @@ public class RadarChartDataset : ChartDataset
     /// Offset for line dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? HoverBorderDashOffset { get; set; }
 
     /// <summary>
-    /// Line joint style. 
+    /// Line joint style.
     /// There are three possible values for this property: 'round', 'bevel', and 'miter'.
     /// </summary>
     /// <remarks>
@@ -146,7 +137,7 @@ public class RadarChartDataset : ChartDataset
     /// The bar border width when hovered (in pixels) when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? HoverBorderWidth { get; set; }
@@ -191,7 +182,7 @@ public class RadarChartDataset : ChartDataset
     /// Point background color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? PointHoverBackgroundColor { get; set; }
@@ -200,7 +191,7 @@ public class RadarChartDataset : ChartDataset
     /// Point border color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? PointHoverBorderColor { get; set; }
@@ -243,7 +234,8 @@ public class RadarChartDataset : ChartDataset
 
     /// <summary>
     /// Style of the point.
-    /// Supported values are 'circle', 'cross', 'crossRot', 'dash', 'line', 'rect', 'rectRounded', 'rectRot', 'star', and 'triangle' to style.
+    /// Supported values are 'circle', 'cross', 'crossRot', 'dash', 'line', 'rect', 'rectRounded', 'rectRot', 'star', and
+    /// 'triangle' to style.
     /// the point.
     /// </summary>
     /// <remarks>
@@ -259,7 +251,7 @@ public class RadarChartDataset : ChartDataset
     /// The unit of the value depends on the scale used.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public bool? SpanGaps { get; set; }
@@ -276,6 +268,4 @@ public class RadarChartDataset : ChartDataset
     #endregion
 }
 
-public class RadarChartDatasetDataLabels : ChartDatasetDataLabels
-{
-}
+public class RadarChartDatasetDataLabels : ChartDatasetDataLabels { }
diff --git a/blazorbootstrap/Models/Charts/ChartDataset/ScatterChart/ScatterChartDataset.cs b/blazorbootstrap/Models/Charts/ChartDataset/ScatterChart/ScatterChartDataset.cs
index 0e396e385..987823b5c 100644
--- a/blazorbootstrap/Models/Charts/ChartDataset/ScatterChart/ScatterChartDataset.cs
+++ b/blazorbootstrap/Models/Charts/ChartDataset/ScatterChart/ScatterChartDataset.cs
@@ -1,13 +1,13 @@
 namespace BlazorBootstrap;
 
 /// <summary>
-/// Scatter charts are based on basic line charts with the x-axis changed to a linear axis. 
+/// Scatter charts are based on basic line charts with the x-axis changed to a linear axis.
 /// To use a scatter chart, data must be passed as objects containing X and Y properties.
 /// <see href="https://www.chartjs.org/docs/latest/charts/scatter.html#dataset-properties" />.
-/// The scatter chart supports all the same properties as the line chart. 
-/// By default, the scatter chart will override the showLine property of the line chart to <see langword="false"/>.
+/// The scatter chart supports all the same properties as the line chart.
+/// By default, the scatter chart will override the showLine property of the line chart to <see langword="false" />.
 /// </summary>
-public class ScatterChartDataset : ChartDataset
+public class ScatterChartDataset : ChartDataset<ScatterChartDataPoint>
 {
     #region Properties, Indexers
 
@@ -40,7 +40,7 @@ public class ScatterChartDataset : ChartDataset
     /// Gets or sets the length and spacing of dashes.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? BorderDash { get; set; }
@@ -54,7 +54,7 @@ public class ScatterChartDataset : ChartDataset
     public double BorderDashOffset { get; set; }
 
     /// <summary>
-    /// Line joint style. 
+    /// Line joint style.
     /// There are three possible values for this property: 'round', 'bevel', and 'miter'.
     /// </summary>
     /// <remarks>
@@ -79,23 +79,14 @@ public class ScatterChartDataset : ChartDataset
     /// </remarks>
     public string CubicInterpolationMode { get; set; } = "default";
 
-    /// <summary>
-    /// Get or sets the Data.
-    /// </summary>
-    /// <remarks>
-    /// Default value is <see langword="null"/>.
-    /// </remarks>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public new List<ScatterChartDataPoint?>? Data { get; set; }
-
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] 
     public LineChartDatasetDataLabels Datalabels { get; set; } = new(); // TODO: add the reference link
 
     /// <summary>
     /// Draw the active points of a dataset over the other points of the dataset.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<bool>? DrawActiveElementsOnTop { get; set; }
@@ -104,7 +95,7 @@ public class ScatterChartDataset : ChartDataset
     /// How to fill the area under the line.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="false"/>.
+    /// Default value is <see langword="false" />.
     /// </remarks>
     public bool Fill { get; set; }
 
@@ -112,7 +103,7 @@ public class ScatterChartDataset : ChartDataset
     /// The line fill color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? HoverBackgroundColor { get; set; }
@@ -121,7 +112,7 @@ public class ScatterChartDataset : ChartDataset
     /// Cap style of the line when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? HoverBorderCapStyle { get; set; }
@@ -130,7 +121,7 @@ public class ScatterChartDataset : ChartDataset
     /// The line color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? HoverBorderColor { get; set; }
@@ -139,7 +130,7 @@ public class ScatterChartDataset : ChartDataset
     /// Gets or sets the length and spacing of dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<double>? HoverBorderDash { get; set; }
@@ -148,13 +139,13 @@ public class ScatterChartDataset : ChartDataset
     /// Offset for line dashes when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? HoverBorderDashOffset { get; set; }
 
     /// <summary>
-    /// Line joint style. 
+    /// Line joint style.
     /// There are three possible values for this property: 'round', 'bevel', and 'miter'.
     /// </summary>
     /// <remarks>
@@ -166,7 +157,7 @@ public class ScatterChartDataset : ChartDataset
     /// The bar border width when hovered (in pixels) when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public double? HoverBorderWidth { get; set; }
@@ -220,7 +211,7 @@ public class ScatterChartDataset : ChartDataset
     /// Point background color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? PointHoverBackgroundColor { get; set; }
@@ -229,7 +220,7 @@ public class ScatterChartDataset : ChartDataset
     /// Point border color when hovered.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<string>? PointHoverBorderColor { get; set; }
@@ -272,7 +263,8 @@ public class ScatterChartDataset : ChartDataset
 
     /// <summary>
     /// Style of the point.
-    /// Supported values are 'circle', 'cross', 'crossRot', 'dash', 'line', 'rect', 'rectRounded', 'rectRot', 'star', and 'triangle' to style.
+    /// Supported values are 'circle', 'cross', 'crossRot', 'dash', 'line', 'rect', 'rectRounded', 'rectRot', 'star', and
+    /// 'triangle' to style.
     /// the point.
     /// </summary>
     /// <remarks>
@@ -289,7 +281,7 @@ public class ScatterChartDataset : ChartDataset
     /// By default, the scatter chart will override the showLine property of the line chart to false.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="false"/>.
+    /// Default value is <see langword="false" />.
     /// </remarks>
     public bool ShowLine { get; } = false;
 
@@ -300,7 +292,7 @@ public class ScatterChartDataset : ChartDataset
     /// The unit of the value depends on the scale used.
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="null"/>.
+    /// Default value is <see langword="null" />.
     /// </remarks>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public bool? SpanGaps { get; set; }
@@ -312,7 +304,7 @@ public class ScatterChartDataset : ChartDataset
     /// true to show the line as a stepped line (tension will be ignored).
     /// </summary>
     /// <remarks>
-    /// Default value is <see langword="false"/>.
+    /// Default value is <see langword="false" />.
     /// </remarks>
     public bool Stepped { get; set; }
 
@@ -346,6 +338,4 @@ public class ScatterChartDataset : ChartDataset
     #endregion
 }
 
-public class ScatterChartDatasetDataLabels : ChartDatasetDataLabels
-{
-}
+public class ScatterChartDatasetDataLabels : ChartDatasetDataLabels { }