diff --git a/samples/TestApplication/Pages/Index.cshtml b/samples/TestApplication/Pages/Index.cshtml
index 3fb5512..75fa8c8 100644
--- a/samples/TestApplication/Pages/Index.cshtml
+++ b/samples/TestApplication/Pages/Index.cshtml
@@ -12,12 +12,12 @@
 
 @functions {
 
-    public ChartJSChart<ChartJsBarDataset> blazorBarChartJS { get; set; } = new ChartJSChart<ChartJsBarDataset>();
+    public ChartJSBarChart blazorBarChartJS { get; set; } = new ChartJSBarChart();
     ChartJsBarChart barChartJs;
 
     protected override void OnInit()
     {
-        blazorBarChartJS = new ChartJSChart<ChartJsBarDataset>()
+        blazorBarChartJS = new ChartJSBarChart()
         {
             ChartType = "bar",
             CanvasId = "myFirstBarChart",
@@ -27,7 +27,7 @@
                 BorderWidth = 1,
                 Display = true
             },
-            Data = new ChartJsData<ChartJsBarDataset>()
+            Data = new ChartJsBarData()
             {
                 Labels = new List<string>() { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" },
                 Datasets = new List<ChartJsBarDataset>()
diff --git a/samples/TestApplication/Pages/LineChart.cshtml b/samples/TestApplication/Pages/LineChart.cshtml
index 74e723e..2c77487 100644
--- a/samples/TestApplication/Pages/LineChart.cshtml
+++ b/samples/TestApplication/Pages/LineChart.cshtml
@@ -10,13 +10,13 @@
 
 @functions{
 
-    public ChartJSChart<ChartJsLineDataset> blazorLineChartJS { get; set; } = new ChartJSChart<ChartJsLineDataset>();
+    public ChartJSLineChart blazorLineChartJS { get; set; } = new ChartJSLineChart();
     ChartJsLineChart lineChartJs;
 
     protected override void OnInit()
     {
 
-        blazorLineChartJS = new ChartJSChart<ChartJsLineDataset>()
+        blazorLineChartJS = new ChartJSLineChart()
         {
             ChartType = "line",
             CanvasId = "myFirstLineChart",
@@ -26,7 +26,7 @@
                 Display = true,
                 Responsive = false
             },
-            Data = new ChartJsData<ChartJsLineDataset>()
+            Data = new ChartJsLineData()
             {
                 Labels = new List<string>() { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" },
                 Datasets = new List<ChartJsLineDataset>()
diff --git a/samples/TestApplication/Pages/RadarChart.cshtml b/samples/TestApplication/Pages/RadarChart.cshtml
index 338c4b0..d6c40fc 100644
--- a/samples/TestApplication/Pages/RadarChart.cshtml
+++ b/samples/TestApplication/Pages/RadarChart.cshtml
@@ -10,13 +10,13 @@
 
 @functions {
 
-    public ChartJSChart<ChartJSRadarDataset> blazorRadarChartJS { get; set; } = new ChartJSChart<ChartJSRadarDataset>();
+    public ChartJSRadarChart blazorRadarChartJS { get; set; } = new ChartJSRadarChart();
     ChartJsRadarChart radarChartJs;
 
     protected override void OnInit()
     {
 
-        blazorRadarChartJS = new ChartJSChart<ChartJSRadarDataset>()
+        blazorRadarChartJS = new ChartJSRadarChart()
         {
             ChartType = "line",
             CanvasId = "myFirstRadarChart",
@@ -25,7 +25,7 @@
                 Text = "Sample chart from Blazor",
                 Display = true
             },
-            Data = new ChartJsData<ChartJSRadarDataset>()
+            Data = new ChartJsRadarData()
             {
                 Labels = new List<string>() { "Eating", "Drinking", "Social", "Coding", "Cycling", "Running" },
                 Datasets = new List<ChartJSRadarDataset>()
diff --git a/src/BlazorComponents/ChartJS/ChartJSBarChart.cs b/src/BlazorComponents/ChartJS/ChartJSBarChart.cs
new file mode 100644
index 0000000..435344e
--- /dev/null
+++ b/src/BlazorComponents/ChartJS/ChartJSBarChart.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace BlazorComponents.ChartJS
+{
+    public class ChartJSBarChart
+    {
+        public string ChartType { get; set; } = "bar";
+        public ChartJsBarData Data { get; set; }
+        public ChartJsOptions Options { get; set; }
+        public string CanvasId { get; set; } = $"BlazorChartJS_{new Random().Next(0, 1000000).ToString()}";
+    }
+}
diff --git a/src/BlazorComponents/ChartJS/ChartJSInterop.cs b/src/BlazorComponents/ChartJS/ChartJSInterop.cs
index 120e5a8..6cf30fc 100644
--- a/src/BlazorComponents/ChartJS/ChartJSInterop.cs
+++ b/src/BlazorComponents/ChartJS/ChartJSInterop.cs
@@ -5,32 +5,32 @@ namespace BlazorComponents.ChartJS
 {
     public class ChartJSInterop
     {
-        public static Task<bool> InitializeLineChart(ChartJSChart<ChartJsLineDataset> lineChart)
+        public static Task<bool> InitializeLineChart(ChartJSLineChart lineChart)
         {
             return JSRuntime.Current.InvokeAsync<bool>("BlazorComponents.ChartJSInterop.InitializeLineChart", new[] { lineChart });
         }
 
-        public static Task<bool> InitializeBarChart(ChartJSChart<ChartJsBarDataset> barChart)
+        public static Task<bool> InitializeBarChart(ChartJSBarChart barChart)
         {
             return JSRuntime.Current.InvokeAsync<bool>("BlazorComponents.ChartJSInterop.InitializeBarChart", new[] { barChart });
         }
 
-        public static Task<bool> UpdateLineChart(ChartJSChart<ChartJsLineDataset> lineChart)
+        public static Task<bool> UpdateLineChart(ChartJSLineChart lineChart)
         {
             return JSRuntime.Current.InvokeAsync<bool>("BlazorComponents.ChartJSInterop.UpdateLineChart", new[] { lineChart });
         }
 
-        public static Task<bool> UpdateBarChart(ChartJSChart<ChartJsBarDataset> barChart)
+        public static Task<bool> UpdateBarChart(ChartJSBarChart barChart)
         {
             return JSRuntime.Current.InvokeAsync<bool>("BlazorComponents.ChartJSInterop.UpdateBarChart", new[] { barChart });
         }
 
-        public static Task<bool> InitializeRadarChart(ChartJSChart<ChartJSRadarDataset> radarChart)
+        public static Task<bool> InitializeRadarChart(ChartJSRadarChart radarChart)
         {
             return JSRuntime.Current.InvokeAsync<bool>("BlazorComponents.ChartJSInterop.InitializeRadarChart", new[] { radarChart });
         }
 
-        public static Task<bool> UpdateRadarChart(ChartJSChart<ChartJSRadarDataset> radarChart)
+        public static Task<bool> UpdateRadarChart(ChartJSRadarChart radarChart)
         {
             return JSRuntime.Current.InvokeAsync<bool>("BlazorComponents.ChartJSInterop.UpdateRadarChart", new[] { radarChart });
         }
diff --git a/src/BlazorComponents/ChartJS/ChartJSLineChart.cs b/src/BlazorComponents/ChartJS/ChartJSLineChart.cs
new file mode 100644
index 0000000..5edb037
--- /dev/null
+++ b/src/BlazorComponents/ChartJS/ChartJSLineChart.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace BlazorComponents.ChartJS
+{
+    public class ChartJSLineChart
+    {
+        public string ChartType { get; set; } = "bar";
+        public ChartJsLineData Data { get; set; }
+        public ChartJsOptions Options { get; set; }
+        public string CanvasId { get; set; } = $"BlazorChartJS_{new Random().Next(0, 1000000).ToString()}";
+    }
+}
diff --git a/src/BlazorComponents/ChartJS/ChartJSRadarChart.cs b/src/BlazorComponents/ChartJS/ChartJSRadarChart.cs
new file mode 100644
index 0000000..fa281d1
--- /dev/null
+++ b/src/BlazorComponents/ChartJS/ChartJSRadarChart.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace BlazorComponents.ChartJS
+{
+    public class ChartJSRadarChart
+    {
+        public string ChartType { get; set; } = "bar";
+        public ChartJsRadarData Data { get; set; }
+        public ChartJsOptions Options { get; set; }
+        public string CanvasId { get; set; } = $"BlazorChartJS_{new Random().Next(0, 1000000).ToString()}";
+    }
+}
diff --git a/src/BlazorComponents/ChartJS/ChartJsBarData.cs b/src/BlazorComponents/ChartJS/ChartJsBarData.cs
new file mode 100644
index 0000000..bfa1c1f
--- /dev/null
+++ b/src/BlazorComponents/ChartJS/ChartJsBarData.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace BlazorComponents.ChartJS
+{
+    public class ChartJsBarData
+    {
+        public List<string> Labels { get; set; } = new List<string>();
+        public List<ChartJsBarDataset> Datasets { get; set; }
+    }
+}
diff --git a/src/BlazorComponents/ChartJS/ChartJsLineData.cs b/src/BlazorComponents/ChartJS/ChartJsLineData.cs
new file mode 100644
index 0000000..85cad08
--- /dev/null
+++ b/src/BlazorComponents/ChartJS/ChartJsLineData.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace BlazorComponents.ChartJS
+{
+    public class ChartJsLineData
+    {
+        public List<string> Labels { get; set; } = new List<string>();
+        public List<ChartJsLineDataset> Datasets { get; set; }
+    }
+}
diff --git a/src/BlazorComponents/ChartJS/ChartJsRadarData.cs b/src/BlazorComponents/ChartJS/ChartJsRadarData.cs
new file mode 100644
index 0000000..783fb8c
--- /dev/null
+++ b/src/BlazorComponents/ChartJS/ChartJsRadarData.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace BlazorComponents.ChartJS
+{
+    public class ChartJsRadarData
+    {
+        public List<string> Labels { get; set; } = new List<string>();
+        public List<ChartJSRadarDataset> Datasets { get; set; }
+    }
+}
diff --git a/src/BlazorComponents/Shared/ChartJsBarChart.cshtml b/src/BlazorComponents/Shared/ChartJsBarChart.cshtml
index 9feb396..6692f01 100644
--- a/src/BlazorComponents/Shared/ChartJsBarChart.cshtml
+++ b/src/BlazorComponents/Shared/ChartJsBarChart.cshtml
@@ -9,7 +9,7 @@
 
 @functions {
     [Parameter]
-    ChartJSChart<ChartJsBarDataset> Chart { get; set; }
+    ChartJSBarChart Chart { get; set; }
     [Parameter]
     int Width { get; set; } = 400;
     [Parameter]
@@ -20,7 +20,7 @@
         ChartJSInterop.InitializeBarChart(Chart);
     }
 
-    public void UpdateChart(ChartJSChart<ChartJsBarDataset> updatedChart)
+    public void UpdateChart(ChartJSBarChart updatedChart)
     {
         ChartJSInterop.UpdateBarChart(updatedChart);
     }
diff --git a/src/BlazorComponents/Shared/ChartJsLineChart.cshtml b/src/BlazorComponents/Shared/ChartJsLineChart.cshtml
index 107acf0..33f8484 100644
--- a/src/BlazorComponents/Shared/ChartJsLineChart.cshtml
+++ b/src/BlazorComponents/Shared/ChartJsLineChart.cshtml
@@ -10,7 +10,7 @@
 @functions {
 
     [Parameter]
-    ChartJSChart<ChartJsLineDataset> Chart { get; set; }
+    ChartJSLineChart Chart { get; set; }
     [Parameter]
     int Width { get; set; } = 200;
     [Parameter]
@@ -27,7 +27,7 @@
         ChartJSInterop.InitializeLineChart(Chart);
     }
 
-    public void UpdateChart(ChartJSChart<ChartJsLineDataset> updatedChart)
+    public void UpdateChart(ChartJSLineChart updatedChart)
     {
         ChartJSInterop.UpdateLineChart(updatedChart);
     }
diff --git a/src/BlazorComponents/Shared/ChartJsRadarChart.cshtml b/src/BlazorComponents/Shared/ChartJsRadarChart.cshtml
index a95fd39..f875cd2 100644
--- a/src/BlazorComponents/Shared/ChartJsRadarChart.cshtml
+++ b/src/BlazorComponents/Shared/ChartJsRadarChart.cshtml
@@ -10,7 +10,7 @@
 @functions {
 
     [Parameter]
-    ChartJSChart<ChartJSRadarDataset> Chart { get; set; }
+    ChartJSRadarChart Chart { get; set; }
     [Parameter]
     int Width { get; set; } = 200;
     [Parameter]
@@ -23,7 +23,7 @@
         ChartJSInterop.InitializeRadarChart(Chart);
     }
 
-    public void UpdateChart(ChartJSChart<ChartJSRadarDataset> updatedChart)
+    public void UpdateChart(ChartJSRadarChart updatedChart)
     {
         ChartJSInterop.UpdateRadarChart(updatedChart);
     }