diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 68299d5..1a749c3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -14,9 +14,9 @@ body:
     attributes:
       label: "Checklist"
       options:
-        - label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
+        - label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/chartjs-java-model/releases/latest)"
           required: true
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
           required: true
         - label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
           required: true
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 7523129..1e536ad 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: "Checklist"
       options:
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
           required: true
         - label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
           required: true
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index 6ecd6ad..71be4ac 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: "Checklist"
       options:
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
           required: true
         - label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
           required: true
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
index 0818116..973e7d8 100644
--- a/.github/workflows/check-build.yml
+++ b/.github/workflows/check-build.yml
@@ -30,7 +30,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [17, 21]
+        java: [11, 17, 21]
         distribution: [temurin]
 
     steps:
@@ -44,7 +44,8 @@ jobs:
         cache: 'maven'
       
     - name: Build with Maven
-      run: ./mvnw -B clean package
+      # Java 17 is required for tests
+      run: ./mvnw -B clean package ${{ matrix.java >=17 && '-P run-integration-tests' || '-Dmaven.test.skip=true' }}
       
     - name: Check for uncommited changes
       run: |
@@ -71,6 +72,14 @@ jobs:
         path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
         if-no-files-found: error
 
+    - name: Upload screenshots of test failures
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-fail-screenshots-${{ matrix.java }}
+        path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/screenshots
+        if-no-files-found: ignore
+
   checkstyle:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml
index 5fb2bc2..7f339b8 100644
--- a/.run/Run Demo.run.xml	
+++ b/.run/Run Demo.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
-    <module name="template-placeholder-demo" />
+    <module name="chartjs-java-model-demo" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29..6a060cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,109 @@
+## 2.6.0
+* Synced ``Doughnut/PieOptions`` from ChartJS source code #293
+* Synced ``GridLineConfiguration`` from ChartJS source code / improved Types for more options #289
+* Updated dependencies
+
+## 2.5.0
+* Synced ``Legend`` from ChartJS source code #285
+
+## 2.4.0
+* PointStyle can also contain non-string constants #280
+* Use ``CoreInteractionOptions`` for ``Options#interaction`` and ``Options#hover`` #281
+* Updated dependencies
+
+## 2.3.1
+* Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262
+* Updated dependencies
+
+## 2.3.0
+* Update available datasets fields from ChartJS source code #244
+* Removed deprecated code
+
+## 2.2.0
+* Improve color handling #238
+  * Change ``Color`` to ``RGBAColor`` as it only handles RGBA
+  * Change all occurrences of ``Color`` to ``Object`` so that other color models (e.g. HSLA or Hex) can be applied
+  * Created ``HSLAColor`` that can be used like ``RGBAColor``
+
+## 2.1.0
+* Charts no longer check if they are drawable #198
+  * ChartJS behavior: If a chart can't be drawn it will render a empty canvas
+  * Deprecated methods: ``Chart#toJsonNative`` and ``Chart#isDrawable``
+* Make ``IndexAxis`` available in all options
+
+## 2.0.2
+_Same as version 2.1.0 - Version was not incremented correctly_
+
+## 2.0.1
+* Restored ``DisplayFormats`` #186
+
+## 2.0.0
+* Scales have been reworked and are now nearly identical to the [types defined in ChartJS](https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts)
+* The use of ``Color`` for various coloring related options is no longer required. 
+  * It's now possible to use e.g. strings
+
+## 1.5.0
+* Added ``JsonIgnore`` to certain fields to help prevent infinite loops #174
+* Corrected model for ``Title`` and ``Font`` #175
+
+## 1.4.1
+* Use ``Number`` instead of ``BigDecimal`` in some additional places #159 (@aripddev)
+
+## 1.4.0
+* Simplify API by using ``Number`` instead of ``BigDecimal``, ``int`` and ``double`` for ``Datapoints`` #154 (@aripddev)
+
+## 1.3.1
+* Add subtitle option #141 (@aripddev)
+* Add ``PointStyle#rectRounded`` #143 (@aripddev)
+* Add ``BubbleDataset#pointStyle`` #144 (@aripddev)
+* ``reverse`` property should be on the ``Scale`` object #145
+* Added all available properties for ``Legend``
+
+## 1.3.0
+* Allows creation of mixed charts #128
+  * New chart class: ``MixedChart``
+  * Some classes have been renamed
+    * ``Data`` -> ``HomogeneousData``
+    * ``AbstractChart`` -> ``HomogeneousChart``
+* Slim down test dependencies
+
+## 1.2.0
+* Add TimeScale and TimeTicks to allow building linear time charts #90 (@astappiev)
+* Add options for the [Zoom plugin](https://www.chartjs.org/chartjs-plugin-zoom/latest/) #117 (@astappiev)
+* Updated dependencies
+
+## 1.1.3
+* Add ``toJsonNative`` method which doesn't run the ``isDrawable`` check #91
+
+## 1.1.2
+* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
+
+## 1.1.1
+* ``AngleLines#lineWidth`` now uses ``BigDecimal`` #76
+* Updated dependencies
+
+## 1.1.0
+* Added support for more [data structures](https://www.chartjs.org/docs/4.4.0/general/data-structures.html) inside ``Dataset#data``
+  * ``Dataset#data`` can now contain ``Object``s
+
+## 1.0.2
+* Support Java 11
+* Updated dependencies
+
+## 1.0.1
+* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/4.4.0/samples/bar/stacked-groups.html) (@dlemaignent)
+
+## 1.0.0
+Initial release
+
+Support for Chart.js v4
+
+Noteworthy changes compared to [Chart.java](https://github.com/mdewilde/chart):
+* Changed the package to ``software.xdev.chartjs.model``
+* All charts (e.g. ``BarChart``, ``LineChart``, ...) are now inside the ``charts`` package
+* Breaking API changes due to compatibility with Chart.js v4; You may checkout the migration guides
+  * [3.x Migration Guide](https://www.chartjs.org/docs/4.3.0/migration/v3-migration.html)
+  * [4.x Migration Guide](https://www.chartjs.org/docs/4.3.0/migration/v4-migration.html)
+* JSON is no longer pretty printed by default due to performance reasons
+* Implemented integration tests
+* Requires Java 17
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be2a186..99a8236 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,10 +34,10 @@ You should have the following things installed:
   * Ensure that the JDK/Java-Version is correct
 
 
-## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/actions/workflows/release.yml)
+## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/chartjs-java-model/release.yml?branch=master)](https://github.com/xdev-software/chartjs-java-model/actions/workflows/release.yml)
 
 Before releasing:
-* Consider doing a [test-deployment](https://github.com/xdev-software/template-placeholder/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+* Consider doing a [test-deployment](https://github.com/xdev-software/chartjs-java-model/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
 * Check the [changelog](CHANGELOG.md)
 
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
diff --git a/LICENSE b/LICENSE
index ccaa2b3..a5ec60d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,6 +187,7 @@
       identification within third-party archives.
 
    Copyright 2024 XDEV Software
+   Copyright 2020 Marceau Dewilde
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index eccf80b..5b330ab 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,25 @@
-[![Latest version](https://img.shields.io/maven-central/v/software.xdev/template-placeholder?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/template-placeholder)
-[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/check-build.yml?branch=develop)](https://github.com/xdev-software/template-placeholder/actions/workflows/check-build.yml?query=branch%3Adevelop)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_template-placeholder&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_template-placeholder)
+[![Latest version](https://img.shields.io/maven-central/v/software.xdev/chartjs-java-model?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/chartjs-java-model)
+[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/chartjs-java-model/check-build.yml?branch=develop)](https://github.com/xdev-software/chartjs-java-model/actions/workflows/check-build.yml?query=branch%3Adevelop)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_chartjs-java-model&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_chartjs-java-model)
+[![ChartJS Documentation](https://img.shields.io/badge/Chart.js-documentation-ff6384?logo=Chart.js)](https://www.chartjs.org/docs/latest/)
 
-# template-placeholder
+# <img src="https://www.chartjs.org/media/logo.svg" height="38" /> chartjs-java-model
+Provides Java models for [Chart.js](https://www.chartjs.org/) so that e.g. a Java Server can build a chart and then instruct a JavaScript client what needs to be shown.
 
+This repo extends the abandoned [Chart.java](https://github.com/mdewilde/chart) and adds support for Chart.js Version 4+.
+
+> [!NOTE]
+> We try our best to implement the ChartJS v4 API however there are a lot of configuration options.<br/>
+> Therefore some parts migth still be missing or use the outdated v2 API from the original repo.<br/>
+> If you think you found a missing or incorrect API please open an issue and/or provide a pull request.
 
 ## Installation
-[Installation guide for the latest release](https://github.com/xdev-software/template-placeholder/releases/latest#Installation)
+[Installation guide for the latest release](https://github.com/xdev-software/chartjs-java-model/releases/latest#Installation)
+
+#### Compatibility with Chart.js
+| Chart.js | ``chartjs-java-model`` version |
+| --- | --- |
+| 4.x | ``1+`` |
 
 ## Support
 If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support).
@@ -15,4 +28,10 @@ If you need support as soon as possible and you can't wait for any pull request,
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/template-placeholder/dependencies)
+View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/chartjs-java-model/dependencies)
+
+## Acknowledgment
+* To all [contributors](https://github.com/xdev-software/chartjs-java-model/graphs/contributors) that helped to improve this library
+  * Especially to the devs at [PrimeTek/PrimeFaces](https://www.primefaces.org/) that regularly provide feedback and PRs
+
+<sub>Disclaimer: This is not an official ChartJS product and not associated</sub>
diff --git a/SECURITY.md b/SECURITY.md
index 34b9514..17c68ea 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,4 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/template-placeholder/security/advisories/new).
+Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/chartjs-java-model/security/advisories/new).
diff --git a/template-placeholder-demo/pom.xml b/chartjs-java-model-demo/pom.xml
similarity index 89%
rename from template-placeholder-demo/pom.xml
rename to chartjs-java-model-demo/pom.xml
index 1af633c..bb5de29 100644
--- a/template-placeholder-demo/pom.xml
+++ b/chartjs-java-model-demo/pom.xml
@@ -6,12 +6,12 @@
 
 	<parent>
 		<groupId>software.xdev</groupId>
-		<artifactId>template-placeholder-root</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<artifactId>chartjs-java-model-root</artifactId>
+		<version>2.6.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>template-placeholder-demo</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>chartjs-java-model-demo</artifactId>
+	<version>2.6.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -20,7 +20,7 @@
 	</organization>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>11</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -32,7 +32,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>software.xdev</groupId>
-			<artifactId>template-placeholder</artifactId>
+			<artifactId>chartjs-java-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/chartjs-java-model-demo/src/main/java/software/xdev/Application.java b/chartjs-java-model-demo/src/main/java/software/xdev/Application.java
new file mode 100644
index 0000000..4dc8b3d
--- /dev/null
+++ b/chartjs-java-model-demo/src/main/java/software/xdev/Application.java
@@ -0,0 +1,66 @@
+package software.xdev;
+
+import java.awt.Desktop;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import software.xdev.chartjs.model.charts.BarChart;
+import software.xdev.chartjs.model.charts.Chart;
+import software.xdev.chartjs.model.data.BarData;
+import software.xdev.chartjs.model.dataset.BarDataset;
+import software.xdev.chartjs.model.options.BarOptions;
+
+
+public final class Application
+{
+	private Application()
+	{
+	}
+	
+	public static void main(final String[] args)
+	{
+		final BarData data = new BarData();
+		data.addLabels("A", "B", "C");
+		data.addDataset(new BarDataset()
+			.setLabel("Dataset1")
+			.setData(1, 3, 2));
+		
+		createAndOpenTestFile(new BarChart()
+			.setData(data)
+			.setOptions(new BarOptions()));
+	}
+	
+	@SuppressWarnings("java:S5443") // Only a demo nothing sensitive is here
+	private static void createAndOpenTestFile(final Chart<?, ?, ?> chart)
+	{
+		try
+		{
+			final Path tmp = Files.createTempFile("chart_test_", ".html");
+			
+			Files.writeString(
+				tmp,
+				String.format("<!DOCTYPE html>\n"
+					+ "<html lang='en'>\n"
+					+ "\t<head>\n"
+					+ "\t\t<meta charset='UTF-8'>\n"
+					+ "\t\t<script src=\"https://cdn.jsdelivr.net/npm/chart.js@4.4.6/dist/chart.umd.js\"></script>\n"
+					+ "\t</head>\n"
+					+ "\t<body>\n"
+					+ "\t\t<canvas id='c' style='border:1px solid #555;'></canvas>\n"
+					+ "\t\t<script>\n"
+					+ "\t\t\tnew Chart(document.getElementById('c').getContext('2d'), %s);\n"
+					+ "\t\t</script>\n"
+					+ "\t</body>\n"
+					+ "</html>", chart.toJson())
+			);
+			
+			Desktop.getDesktop().browse(tmp.toUri());
+		}
+		catch(final IOException e)
+		{
+			throw new UncheckedIOException(e);
+		}
+	}
+}
diff --git a/template-placeholder/pom.xml b/chartjs-java-model/pom.xml
similarity index 70%
rename from template-placeholder/pom.xml
rename to chartjs-java-model/pom.xml
index abbbb53..8f6faed 100644
--- a/template-placeholder/pom.xml
+++ b/chartjs-java-model/pom.xml
@@ -5,17 +5,17 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>template-placeholder</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>chartjs-java-model</artifactId>
+	<version>2.6.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>template-placeholder</name>
-	<description>template-placeholder</description>
-	<url>https://github.com/xdev-software/template-placeholder</url>
+	<name>chartjs-java-model</name>
+	<description>chartjs-java-model</description>
+	<url>https://github.com/xdev-software/chartjs-java-model</url>
 
 	<scm>
-		<url>https://github.com/xdev-software/template-placeholder</url>
-		<connection>scm:git:https://github.com/xdev-software/template-placeholder.git</connection>
+		<url>https://github.com/xdev-software/chartjs-java-model</url>
+		<connection>scm:git:https://github.com/xdev-software/chartjs-java-model.git</connection>
 	</scm>
 
 	<inceptionYear>2023</inceptionYear>
@@ -42,11 +42,18 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>11</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+		<slf4j-version>2.0.16</slf4j-version>
+		<log4j-version>2.24.2</log4j-version>
+		<testcontainers-version>1.20.4</testcontainers-version>
+
+		<!-- by default run no tests as Docker is required -->
+		<skipTests>true</skipTests>
 	</properties>
 
 	<repositories>
@@ -84,6 +91,97 @@
 		</repository>
 	</distributionManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.18.2</version>
+		</dependency>
+
+		<!-- Tests -->
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+			<version>${slf4j-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
+			<version>${log4j-version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- JUnit -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.11.3</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Testcontainers -->
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<version>${testcontainers-version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<!-- No JUnit 4 -->
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>software.xdev</groupId>
+			<artifactId>testcontainers-junit4-mock</artifactId>
+			<version>1.0.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${testcontainers-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>software.xdev</groupId>
+			<artifactId>testcontainers-selenium</artifactId>
+			<version>1.1.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Selenium -->
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-chrome-driver</artifactId>
+			<version>4.27.0</version>
+			<scope>test</scope>
+			<exclusions>
+				<!-- Tracing is not needed -->
+				<exclusion>
+					<groupId>io.opentelemetry</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<pluginManagement>
 			<plugins>
@@ -172,9 +270,24 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.5.2</version>
+				<configuration>
+					<skipTests>${skipTests}</skipTests>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<profiles>
+		<profile>
+			<id>run-integration-tests</id>
+			<properties>
+				<skipTests>false</skipTests>
+			</properties>
+		</profile>
 		<profile>
 			<id>ossrh</id>
 			<build>
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/EnumNameToCamelCase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/EnumNameToCamelCase.java
new file mode 100644
index 0000000..67d60f2
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/EnumNameToCamelCase.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model;
+
+import java.util.Locale;
+
+
+public final class EnumNameToCamelCase
+{
+	private EnumNameToCamelCase()
+	{
+	}
+	
+	public static String getName(final Enum<?> e)
+	{
+		final StringBuilder sb = new StringBuilder(e.name().length());
+		for(final String s : e.name().split("_"))
+		{
+			if(sb.length() == 0)
+			{
+				sb.append(s.toLowerCase(Locale.ENGLISH));
+			}
+			else
+			{
+				sb.append(s.substring(0, 1).toUpperCase(Locale.ENGLISH))
+					.append(s.substring(1).toLowerCase(Locale.ENGLISH));
+			}
+		}
+		return sb.toString();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java
new file mode 100644
index 0000000..baf5781
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import java.io.UncheckedIOException;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+import software.xdev.chartjs.model.data.AbstractData;
+import software.xdev.chartjs.model.options.Options;
+
+
+public abstract class AbstractChart<T, O extends Options<?, ?>, D extends AbstractData<?, ?>>
+	implements Chart<T, O, D>
+{
+	protected D data;
+	protected O options;
+	
+	@JsonIgnore
+	protected ObjectWriter defaultObjectWriter = new ObjectMapper()
+		.setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY)
+		.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
+		.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
+		.setVisibility(PropertyAccessor.IS_GETTER, JsonAutoDetect.Visibility.NONE)
+		.setVisibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE)
+		.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.NONE)
+		.writer()
+		.forType(this.getClass());
+	
+	protected AbstractChart()
+	{
+	}
+	
+	protected AbstractChart(final D data)
+	{
+		this();
+		this.data = data;
+	}
+	
+	protected AbstractChart(final D data, final O options)
+	{
+		this(data);
+		this.options = options;
+	}
+	
+	public D getData()
+	{
+		return this.data;
+	}
+	
+	@Override
+	public T setData(final D data)
+	{
+		this.data = data;
+		return this.self();
+	}
+	
+	public O getOptions()
+	{
+		return this.options;
+	}
+	
+	@Override
+	public T setOptions(final O options)
+	{
+		this.options = options;
+		return this.self();
+	}
+	
+	@JsonIgnore
+	public ObjectWriter getDefaultObjectWriter()
+	{
+		return this.defaultObjectWriter;
+	}
+	
+	@JsonIgnore
+	public T setDefaultObjectWriter(final ObjectWriter defaultObjectWriter)
+	{
+		this.defaultObjectWriter = defaultObjectWriter;
+		return this.self();
+	}
+	
+	@Override
+	public String toJson()
+	{
+		try
+		{
+			return this.defaultObjectWriter.writeValueAsString(this);
+		}
+		catch(final JsonProcessingException e)
+		{
+			throw new UncheckedIOException("Failed to write json", e);
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected T self()
+	{
+		return (T)this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java
new file mode 100644
index 0000000..e9381fc
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.BarData;
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.options.BarOptions;
+import software.xdev.chartjs.model.options.Options;
+
+
+public class BarChart extends HomogeneousChart<BarChart, BarOptions, BarData>
+{
+	public BarChart()
+	{
+	}
+	
+	public BarChart(final BarData data)
+	{
+		super(data);
+	}
+	
+	public BarChart(final BarData data, final BarOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BarChart}.
+	 *
+	 * @return a new {@link BarData} instance
+	 */
+	public static BarData data()
+	{
+		return new BarData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link BarChart}.
+	 *
+	 * @return a new {@link BarOptions} instance
+	 */
+	public static BarOptions options()
+	{
+		return new BarOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "bar";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BubbleChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BubbleChart.java
new file mode 100644
index 0000000..05e4011
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BubbleChart.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.BubbleData;
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.options.BubbleOptions;
+import software.xdev.chartjs.model.options.Options;
+
+
+public class BubbleChart extends HomogeneousChart<BubbleChart, BubbleOptions, BubbleData>
+{
+	public BubbleChart()
+	{
+	}
+	
+	public BubbleChart(final BubbleData data)
+	{
+		super(data);
+	}
+	
+	public BubbleChart(final BubbleData data, final BubbleOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BubbleChart}.
+	 *
+	 * @return a new {@link BubbleData} instance
+	 */
+	public static BubbleData data()
+	{
+		return new BubbleData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link BubbleChart}.
+	 *
+	 * @return a new {@link BubbleOptions} instance
+	 */
+	public static BubbleOptions options()
+	{
+		return new BubbleOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "bubble";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java
new file mode 100644
index 0000000..2af80e9
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import software.xdev.chartjs.model.data.AbstractData;
+import software.xdev.chartjs.model.options.Options;
+
+
+@SuppressWarnings("java:S119") // SELF means the Chart itself... Not a problem
+public interface Chart<SELF, O extends Options<?, ?>, D extends AbstractData<?, ?>>
+{
+	/**
+	 * @return type of this {@link Chart} implementation for proper drawing in JavaScript.
+	 */
+	@JsonProperty("type")
+	String getType();
+	
+	/**
+	 * <p>
+	 * Convert {@code this} instance to Json for use with Chart.js library.
+	 * </p>
+	 *
+	 * @return json representation of {@code this} {@link Chart}
+	 */
+	String toJson();
+	
+	SELF setOptions(final O options);
+	
+	SELF setData(final D data);
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/DoughnutChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/DoughnutChart.java
new file mode 100644
index 0000000..d7d9641
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/DoughnutChart.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.DoughnutData;
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.options.DoughnutOptions;
+import software.xdev.chartjs.model.options.Options;
+
+
+public class DoughnutChart extends HomogeneousChart<DoughnutChart, DoughnutOptions, DoughnutData>
+{
+	public DoughnutChart()
+	{
+	}
+	
+	public DoughnutChart(final DoughnutData data)
+	{
+		super(data);
+	}
+	
+	public DoughnutChart(final DoughnutData data, final DoughnutOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link DoughnutChart}.
+	 *
+	 * @return a new {@link DoughnutData} instance
+	 */
+	public static DoughnutData data()
+	{
+		return new DoughnutData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link DoughnutChart}.
+	 *
+	 * @return a new {@link DoughnutOptions} instance
+	 */
+	public static DoughnutOptions options()
+	{
+		return new DoughnutOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "doughnut";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/HomogeneousChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/HomogeneousChart.java
new file mode 100644
index 0000000..dba44cb
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/HomogeneousChart.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.options.Options;
+
+
+public abstract class HomogeneousChart<T, O extends Options<O, ?>, D extends HomogeneousData<D, ?>>
+	extends AbstractChart<T, O, D>
+{
+	protected HomogeneousChart()
+	{
+	}
+	
+	protected HomogeneousChart(final D data)
+	{
+		super(data);
+	}
+	
+	protected HomogeneousChart(final D data, final O options)
+	{
+		super(data, options);
+	}
+	
+	protected boolean hasScaleWithId(final String id)
+	{
+		if(this.getOptions() != null
+			&& this.getOptions().getScales() != null
+			&& this.getOptions().getScales().getScalesList() != null)
+		{
+			return this.getOptions().getScales().getScalesList().get(id) != null;
+		}
+		return false;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/LineChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/LineChart.java
new file mode 100644
index 0000000..6cc20e6
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/LineChart.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.data.LineData;
+import software.xdev.chartjs.model.options.LineOptions;
+import software.xdev.chartjs.model.options.Options;
+
+
+public class LineChart extends HomogeneousChart<LineChart, LineOptions, LineData>
+{
+	public LineChart()
+	{
+	}
+	
+	public LineChart(final LineData data)
+	{
+		super(data);
+	}
+	
+	public LineChart(final LineData data, final LineOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link LineChart}.
+	 *
+	 * @return a new {@link LineData} instance
+	 */
+	public static LineData data()
+	{
+		return new LineData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link LineChart}.
+	 *
+	 * @return a new {@link LineOptions} instance
+	 */
+	public static LineOptions options()
+	{
+		return new LineOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "line";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/MixedChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/MixedChart.java
new file mode 100644
index 0000000..34d0386
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/MixedChart.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.MixedData;
+import software.xdev.chartjs.model.options.Options;
+
+
+/**
+ * Allows creation of <a href="https://www.chartjs.org/docs/latest/charts/mixed.html">mixed chart types</a>
+ */
+public class MixedChart extends AbstractChart<MixedChart, Options<?, ?>, MixedData>
+{
+	protected String type;
+	
+	public MixedChart setType(final String type)
+	{
+		this.type = type;
+		return this.self();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return this.type;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PieChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PieChart.java
new file mode 100644
index 0000000..5ead8c6
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PieChart.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.data.PieData;
+import software.xdev.chartjs.model.options.Options;
+import software.xdev.chartjs.model.options.PieOptions;
+
+
+public class PieChart extends HomogeneousChart<PieChart, PieOptions, PieData>
+{
+	public PieChart()
+	{
+	}
+	
+	public PieChart(final PieData data)
+	{
+		super(data);
+	}
+	
+	public PieChart(final PieData data, final PieOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link PieChart}.
+	 *
+	 * @return a new {@link PieData} instance
+	 */
+	public static PieData data()
+	{
+		return new PieData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link PieChart}.
+	 *
+	 * @return a new {@link PieOptions} instance
+	 */
+	public static PieOptions options()
+	{
+		return new PieOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "pie";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PolarChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PolarChart.java
new file mode 100644
index 0000000..66967af
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PolarChart.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.data.PolarData;
+import software.xdev.chartjs.model.options.Options;
+import software.xdev.chartjs.model.options.PolarOptions;
+
+
+public class PolarChart extends HomogeneousChart<PolarChart, PolarOptions, PolarData>
+{
+	public PolarChart()
+	{
+	}
+	
+	public PolarChart(final PolarData data)
+	{
+		super(data);
+	}
+	
+	public PolarChart(final PolarData data, final PolarOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link PolarChart}.
+	 *
+	 * @return a new {@link PolarData} instance
+	 */
+	public static PolarData data()
+	{
+		return new PolarData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link PolarChart}.
+	 *
+	 * @return a new {@link PolarOptions} instance
+	 */
+	public static PolarOptions options()
+	{
+		return new PolarOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "polarArea";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/RadarChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/RadarChart.java
new file mode 100644
index 0000000..82aa426
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/RadarChart.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.data.RadarData;
+import software.xdev.chartjs.model.options.Options;
+import software.xdev.chartjs.model.options.RadarOptions;
+
+
+public class RadarChart extends HomogeneousChart<RadarChart, RadarOptions, RadarData>
+{
+	public RadarChart()
+	{
+	}
+	
+	public RadarChart(final RadarData data)
+	{
+		super(data);
+	}
+	
+	public RadarChart(final RadarData data, final RadarOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link RadarChart}.
+	 *
+	 * @return a new {@link RadarData} instance
+	 */
+	public static RadarData data()
+	{
+		return new RadarData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link RadarChart}.
+	 *
+	 * @return a new {@link RadarOptions} instance
+	 */
+	public static RadarOptions options()
+	{
+		return new RadarOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "radar";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/ScatterChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/ScatterChart.java
new file mode 100644
index 0000000..5eba4a6
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/ScatterChart.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.data.ScatterData;
+import software.xdev.chartjs.model.options.LineOptions;
+import software.xdev.chartjs.model.options.Options;
+
+
+public class ScatterChart extends HomogeneousChart<ScatterChart, LineOptions, ScatterData>
+{
+	
+	public ScatterChart()
+	{
+	}
+	
+	public ScatterChart(final ScatterData data)
+	{
+		super(data);
+	}
+	
+	public ScatterChart(final ScatterData data, final LineOptions options)
+	{
+		super(data, options);
+	}
+	
+	/**
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link ScatterChart}.
+	 *
+	 * @return a new {@link ScatterData} instance
+	 */
+	public static ScatterData data()
+	{
+		return new ScatterData();
+	}
+	
+	/**
+	 * Static factory, constructs an {@link Options} implementation appropriate for a {@link ScatterChart}.
+	 *
+	 * @return a new {@link LineOptions} instance
+	 */
+	public static LineOptions options()
+	{
+		return new LineOptions();
+	}
+	
+	@Override
+	public String getType()
+	{
+		return "scatter";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/HSLAColor.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/HSLAColor.java
new file mode 100644
index 0000000..7d4bad3
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/HSLAColor.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.color;
+
+import java.security.SecureRandom;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Random;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+@SuppressWarnings("checkstyle:MagicNumber")
+public class HSLAColor
+{
+	protected static final Random RANDOMIZER = new SecureRandom();
+	
+	protected final double hue;
+	protected final double saturationPercent;
+	protected final double lightnessPercent;
+	protected final double alpha;
+
+	public HSLAColor(
+		final double hue,
+		final double saturationPercent,
+		final double lightnessPercent,
+		final double alpha)
+	{
+		if(!HSLAColor.isPercentWithinBounds(saturationPercent)
+			|| !HSLAColor.isPercentWithinBounds(lightnessPercent)
+			|| !HSLAColor.isAlphaWithinBounds(alpha))
+		{
+			throw new IllegalArgumentException("at least one argument is not within bounds");
+		}
+		this.hue = hue;
+		this.saturationPercent = saturationPercent;
+		this.lightnessPercent = lightnessPercent;
+		this.alpha = alpha;
+	}
+
+	public HSLAColor(final double hue, final double saturationPercent, final double lightnessPercent)
+	{
+		this(hue, saturationPercent, lightnessPercent, 1);
+	}
+	
+	public HSLAColor(final HSLAColor color, final double alpha)
+	{
+		if(color == null)
+		{
+			throw new IllegalArgumentException("Color argument may not be null");
+		}
+		if(!HSLAColor.isAlphaWithinBounds(alpha))
+		{
+			throw new IllegalArgumentException("alpha double argument is not within allowed bounds: "
+				+ "allowed values are between 0 and 1 (inclusive), but value passed is " + alpha);
+		}
+		this.hue = color.getHue();
+		this.saturationPercent = color.getSaturationPercent();
+		this.lightnessPercent = color.getLightnessPercent();
+		this.alpha = alpha;
+	}
+	
+	public static HSLAColor random()
+	{
+		final double hue = RANDOMIZER.nextDouble() * 360.0;
+		final double saturationPercent = RANDOMIZER.nextDouble() * 100.0;
+		final double lightnessPercent = RANDOMIZER.nextDouble() * 100.0;
+		final double alpha = RANDOMIZER.nextDouble();
+		return new HSLAColor(hue, saturationPercent, lightnessPercent, alpha);
+	}
+	
+	public static boolean isPercentWithinBounds(final double percent)
+	{
+		return Double.compare(0.0d, percent) <= 0 && Double.compare(100.0d, percent) >= 0;
+	}
+	
+	public static boolean isAlphaWithinBounds(final double alpha)
+	{
+		return Double.compare(0.0d, alpha) <= 0 && Double.compare(1.0d, alpha) >= 0;
+	}
+	
+	public double getHue()
+	{
+		return this.hue;
+	}
+	
+	public double getSaturationPercent()
+	{
+		return this.saturationPercent;
+	}
+	
+	public double getLightnessPercent()
+	{
+		return this.lightnessPercent;
+	}
+	
+	public double getAlpha()
+	{
+		return this.alpha;
+	}
+	
+	/**
+	 * @return serialized version of this {@code Color}, as used for JSON.
+	 */
+	@JsonValue
+	public String hsla()
+	{
+		return "hsla("
+			+ String.format(Locale.US, "%.3f", this.getHue()) + ","
+			+ String.format(Locale.US, "%.3f", this.getSaturationPercent()) + "%,"
+			+ String.format(Locale.US, "%.3f", this.getLightnessPercent()) + "%,"
+			+ String.format(Locale.US, "%.3f", this.getAlpha())
+			+ ")";
+	}
+	
+	@Override
+	public String toString()
+	{
+		return this.hsla();
+	}
+	
+	@Override
+	public boolean equals(final Object o)
+	{
+		if(this == o)
+		{
+			return true;
+		}
+		if(!(o instanceof HSLAColor))
+		{
+			return false;
+		}
+		final HSLAColor color = (HSLAColor)o;
+		return Double.compare(this.getHue(), color.getHue()) == 0
+			&& Double.compare(this.getSaturationPercent(), color.getSaturationPercent()) == 0
+			&& Double.compare(this.getLightnessPercent(), color.getLightnessPercent()) == 0
+			&& Double.compare(this.getAlpha(), color.getAlpha()) == 0;
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Objects.hash(this.getHue(), this.getSaturationPercent(), this.getLightnessPercent(), this.getAlpha());
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/RGBAColor.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/RGBAColor.java
new file mode 100644
index 0000000..c181dd4
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/RGBAColor.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.color;
+
+import java.security.SecureRandom;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Random;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+/**
+ * Immutable RGBa color model.
+ */
+@SuppressWarnings("checkstyle:MagicNumber") // RGB Numbers
+public class RGBAColor
+{
+	protected static final Random RANDOMIZER = new SecureRandom();
+	
+	public static final RGBAColor TRANSPARENT = new RGBAColor(0, 0, 0, 0);
+	public static final RGBAColor BLACK = new RGBAColor(0, 0, 0);
+	public static final RGBAColor WHITE = new RGBAColor(255, 255, 255);
+	public static final RGBAColor RED = new RGBAColor(255, 0, 0);
+	public static final RGBAColor LIME = new RGBAColor(0, 255, 0);
+	public static final RGBAColor BLUE = new RGBAColor(0, 0, 255);
+	public static final RGBAColor YELLOW = new RGBAColor(255, 255, 0);
+	public static final RGBAColor CYAN = new RGBAColor(0, 255, 255);
+	public static final RGBAColor MAGENTA = new RGBAColor(255, 0, 255);
+	public static final RGBAColor SILVER = new RGBAColor(192, 192, 192);
+	public static final RGBAColor GRAY = new RGBAColor(128, 128, 128);
+	public static final RGBAColor MAROON = new RGBAColor(128, 0, 0);
+	public static final RGBAColor OLIVE = new RGBAColor(128, 128, 0);
+	public static final RGBAColor GREEN = new RGBAColor(0, 128, 0);
+	public static final RGBAColor PURPLE = new RGBAColor(128, 0, 128);
+	public static final RGBAColor TEAL = new RGBAColor(0, 128, 128);
+	public static final RGBAColor NAVY = new RGBAColor(0, 0, 128);
+	public static final RGBAColor DARK_RED = new RGBAColor(139, 0, 0);
+	public static final RGBAColor BROWN = new RGBAColor(165, 42, 42);
+	public static final RGBAColor CRIMSON = new RGBAColor(220, 20, 60);
+	public static final RGBAColor DARK_SALMON = new RGBAColor(233, 150, 122);
+	public static final RGBAColor SALMON = new RGBAColor(250, 128, 114);
+	public static final RGBAColor LIGHT_SALMON = new RGBAColor(255, 160, 122);
+	public static final RGBAColor ORANGE_RED = new RGBAColor(255, 69, 0);
+	public static final RGBAColor DARK_ORANGE = new RGBAColor(255, 140, 0);
+	public static final RGBAColor ORANGE = new RGBAColor(255, 165, 0);
+	public static final RGBAColor GOLD = new RGBAColor(255, 215, 0);
+	public static final RGBAColor DARK_KHAKI = new RGBAColor(189, 183, 107);
+	public static final RGBAColor KHAKI = new RGBAColor(240, 230, 140);
+	public static final RGBAColor YELLOW_GREEN = new RGBAColor(154, 205, 50);
+	public static final RGBAColor DARK_OLIVE_GREEN = new RGBAColor(85, 107, 47);
+	public static final RGBAColor GREEN_YELLOW = new RGBAColor(173, 255, 47);
+	public static final RGBAColor DARK_GREEN = new RGBAColor(0, 100, 0);
+	public static final RGBAColor DARK_CYAN = new RGBAColor(0, 139, 139);
+	public static final RGBAColor LIGHT_CYAN = new RGBAColor(224, 255, 255);
+	public static final RGBAColor AQUA = new RGBAColor(0, 255, 255);
+	public static final RGBAColor DARK_TURQUOISE = new RGBAColor(0, 206, 209);
+	public static final RGBAColor TURQUOISE = new RGBAColor(64, 224, 208);
+	public static final RGBAColor MEDIUM_TURQUOISE = new RGBAColor(72, 209, 204);
+	public static final RGBAColor PALE_TURQUOISE = new RGBAColor(175, 238, 238);
+	public static final RGBAColor AQUA_MARINE = new RGBAColor(127, 255, 212);
+	public static final RGBAColor LIGHT_BLUE = new RGBAColor(173, 216, 230);
+	public static final RGBAColor SKY_BLUE = new RGBAColor(135, 206, 235);
+	public static final RGBAColor LIGHT_SKY_BLUE = new RGBAColor(135, 206, 250);
+	public static final RGBAColor MIDNIGHT_BLUE = new RGBAColor(25, 25, 112);
+	public static final RGBAColor DARK_BLUE = new RGBAColor(0, 0, 139);
+	public static final RGBAColor MEDIUM_BLUE = new RGBAColor(0, 0, 205);
+	public static final RGBAColor BLUE_VIOLET = new RGBAColor(138, 43, 226);
+	public static final RGBAColor VIOLET = new RGBAColor(238, 130, 238);
+	public static final RGBAColor DEEP_PINK = new RGBAColor(255, 20, 147);
+	public static final RGBAColor HOT_PINK = new RGBAColor(255, 105, 180);
+	public static final RGBAColor LIGHT_PINK = new RGBAColor(255, 182, 193);
+	public static final RGBAColor PINK = new RGBAColor(255, 192, 203);
+	public static final RGBAColor LIGHT_YELLOW = new RGBAColor(255, 255, 224);
+	public static final RGBAColor CHOCOLATE = new RGBAColor(210, 105, 30);
+	public static final RGBAColor TAN = new RGBAColor(210, 180, 140);
+	public static final RGBAColor LINEN = new RGBAColor(250, 240, 230);
+	public static final RGBAColor LAVENDER = new RGBAColor(230, 230, 250);
+	public static final RGBAColor AZURE = new RGBAColor(240, 255, 255);
+	public static final RGBAColor DIM_GRAY = new RGBAColor(105, 105, 105);
+	public static final RGBAColor DARK_GRAY = new RGBAColor(169, 169, 169);
+	public static final RGBAColor LIGHT_GRAY = new RGBAColor(211, 211, 211);
+	
+	protected final int r;
+	protected final int g;
+	protected final int b;
+	protected final double alpha;
+	
+	/**
+	 * Constructs a new Color instance
+	 *
+	 * @param r     value for Red color channel. Value between 0 and 255 (inclusive).
+	 * @param g     value for Green color channel. Value between 0 and 255 (inclusive).
+	 * @param b     value for Blue color channel. Value between 0 and 255 (inclusive).
+	 * @param alpha value for alpha transparency. Value between 0 and 1 (inclusive), with 0 fully transparent and 1
+	 *              fully opaque.
+	 */
+	public RGBAColor(final int r, final int g, final int b, final double alpha)
+	{
+		if(!RGBAColor.isChannelWithinBounds(r)
+			|| !RGBAColor.isChannelWithinBounds(g)
+			|| !RGBAColor.isChannelWithinBounds(b)
+			|| !RGBAColor.isAlphaWithinBounds(alpha))
+		{
+			throw new IllegalArgumentException("at least one argument is not within bounds");
+		}
+		this.r = r;
+		this.g = g;
+		this.b = b;
+		this.alpha = alpha;
+	}
+	
+	/**
+	 * Constructs a new Color instance with alpha set fully opaque
+	 *
+	 * @param r value for Red color channel. Value between 0 and 255 (inclusive).
+	 * @param g value for Green color channel. Value between 0 and 255 (inclusive).
+	 * @param b value for Blue color channel. Value between 0 and 255 (inclusive).
+	 */
+	public RGBAColor(final int r, final int g, final int b)
+	{
+		this(r, g, b, 1);
+	}
+	
+	/**
+	 * Constructs a new Color instance with the RGB values of the Color argument and the alpha transparency of the
+	 * double argument.
+	 */
+	public RGBAColor(final RGBAColor color, final double alpha)
+	{
+		if(color == null)
+		{
+			throw new IllegalArgumentException("Color argument may not be null");
+		}
+		if(!RGBAColor.isAlphaWithinBounds(alpha))
+		{
+			throw new IllegalArgumentException("alpha double argument is not within allowed bounds: "
+				+ "allowed values are between 0 and 1 (inclusive), but value passed is " + alpha);
+		}
+		this.r = color.getR();
+		this.g = color.getG();
+		this.b = color.getB();
+		this.alpha = alpha;
+	}
+	
+	/**
+	 * Constructs and returns a new fully random Color instance.
+	 *
+	 * @return Color
+	 */
+	public static RGBAColor random()
+	{
+		final int r = RANDOMIZER.nextInt(256);
+		final int g = RANDOMIZER.nextInt(256);
+		final int b = RANDOMIZER.nextInt(256);
+		final double a = RANDOMIZER.nextDouble();
+		return new RGBAColor(r, g, b, a);
+	}
+	
+	/**
+	 * <p>
+	 * Verify that argument is valid value for the R, G or B channel.
+	 * </p>
+	 *
+	 * <p>
+	 * Any integer between 0 and 255 (inclusive) is valid.
+	 * </p>
+	 *
+	 * @return true if argument is valid R, G or B value
+	 */
+	public static boolean isChannelWithinBounds(final int channel)
+	{
+		return channel >= 0 && channel <= 255;
+	}
+	
+	/**
+	 * <p>
+	 * Verify that argument is valid value for the alpha channel.
+	 * </p>
+	 *
+	 * <p>
+	 * Any double between 0.0d and 1.0d (inclusive) is valid.
+	 * </p>
+	 *
+	 * @return true if argument is valid alpha value
+	 */
+	public static boolean isAlphaWithinBounds(final double alpha)
+	{
+		return Double.compare(0.0d, alpha) <= 0 && Double.compare(1.0d, alpha) >= 0;
+	}
+	
+	/**
+	 * @return red channel value, between 0 and 255 (inclusive)
+	 */
+	public int getR()
+	{
+		return this.r;
+	}
+	
+	/**
+	 * @return green channel value, between 0 and 255 (inclusive)
+	 */
+	public int getG()
+	{
+		return this.g;
+	}
+	
+	/**
+	 * @return blue channel value, between 0 and 255 (inclusive)
+	 */
+	public int getB()
+	{
+		return this.b;
+	}
+	
+	/**
+	 * @return alpha channel value, between 0.0d and 1.0d (inclusive)
+	 */
+	public double getAlpha()
+	{
+		return this.alpha;
+	}
+	
+	/**
+	 * @return serialized version of this {@code Color}, as used for JSON.
+	 */
+	@JsonValue
+	public String rgba()
+	{
+		return "rgba("
+			+ this.r + ","
+			+ this.g + ","
+			+ this.b + ","
+			+ String.format(Locale.US, "%.3f", this.alpha)
+			+ ")";
+	}
+	
+	@Override
+	public String toString()
+	{
+		return this.rgba();
+	}
+	
+	@Override
+	public boolean equals(final Object o)
+	{
+		if(this == o)
+		{
+			return true;
+		}
+		if(!(o instanceof RGBAColor))
+		{
+			return false;
+		}
+		final RGBAColor color = (RGBAColor)o;
+		return this.getR() == color.getR()
+			&& this.getG() == color.getG()
+			&& this.getB() == color.getB()
+			&& Double.compare(this.getAlpha(), color.getAlpha()) == 0;
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Objects.hash(this.getR(), this.getG(), this.getB(), this.getAlpha());
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/AbstractData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/AbstractData.java
new file mode 100644
index 0000000..200c2fb
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/AbstractData.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import software.xdev.chartjs.model.dataset.Dataset;
+
+
+public abstract class AbstractData<D extends AbstractData<D, T>, T extends Dataset<?, ?>>
+{
+	private final List<String> labels = new ArrayList<>();
+	private final List<T> datasets = new ArrayList<>();
+	
+	/**
+	 * @return unmodifiable list of all labels, never {@code null}
+	 */
+	public List<String> getLabels()
+	{
+		return Collections.unmodifiableList(this.labels);
+	}
+	
+	/**
+	 * Sets the backing label list, replacing any labels previously added or set
+	 *
+	 * @return this object to allow method chaining
+	 */
+	public D setLabels(final Collection<String> labels)
+	{
+		this.labels.clear();
+		if(labels != null)
+		{
+			this.labels.addAll(labels);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * Sets the backing label list, replacing any labels previously added or set
+	 *
+	 * @return this object to allow method chaining
+	 */
+	public D setLabels(final String... labels)
+	{
+		this.labels.clear();
+		if(labels != null)
+		{
+			this.labels.addAll(Arrays.asList(labels));
+		}
+		return this.self();
+	}
+	
+	/**
+	 * Removes all labels from the backing list
+	 *
+	 * @return this object to allow method chaining
+	 */
+	public D clearLabels()
+	{
+		this.labels.clear();
+		return this.self();
+	}
+	
+	/**
+	 * Adds the label to the backing label list
+	 *
+	 * @return this object to allow method chaining
+	 */
+	public D addLabel(final String label)
+	{
+		this.labels.add(label);
+		return this.self();
+	}
+	
+	/**
+	 * Adds the labels to the backing label list
+	 *
+	 * @return this object to allow method chaining
+	 */
+	public D addLabels(final String... label)
+	{
+		this.labels.addAll(Arrays.asList(label));
+		return this.self();
+	}
+	
+	/**
+	 * @return unmodifiable list of all datasets, never {@code null}
+	 */
+	public List<T> getDatasets()
+	{
+		return Collections.unmodifiableList(this.datasets);
+	}
+	
+	/**
+	 * @return this object to allow method chaining
+	 */
+	public D setDatasets(final Collection<T> datasets)
+	{
+		this.datasets.clear();
+		if(datasets != null)
+		{
+			this.datasets.addAll(datasets);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @return this object to allow method chaining
+	 */
+	public D addDataset(final T dataset)
+	{
+		this.datasets.add(dataset);
+		return this.self();
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected D self()
+	{
+		return (D)this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java
new file mode 100644
index 0000000..435e3b9
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.BarDataset;
+
+
+public class BarData extends HomogeneousData<BarData, BarDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java
new file mode 100644
index 0000000..4f774c6
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.BubbleDataset;
+
+
+public class BubbleData extends HomogeneousData<BubbleData, BubbleDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java
new file mode 100644
index 0000000..11503d5
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.DoughnutDataset;
+
+
+public class DoughnutData extends HomogeneousData<DoughnutData, DoughnutDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/HomogeneousData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/HomogeneousData.java
new file mode 100644
index 0000000..5bdcef6
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/HomogeneousData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.Dataset;
+
+
+public class HomogeneousData<D extends HomogeneousData<D, T>, T extends Dataset<T, ?>> extends AbstractData<D, T>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java
new file mode 100644
index 0000000..e8250f1
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.LineDataset;
+
+
+public class LineData extends HomogeneousData<LineData, LineDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/MixedData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/MixedData.java
new file mode 100644
index 0000000..6d18ef3
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/MixedData.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.Dataset;
+
+
+/**
+ * Allows creation of <a href="https://www.chartjs.org/docs/latest/charts/mixed.html">mixed chart types</a>
+ */
+public class MixedData extends AbstractData<MixedData, Dataset<?, ?>>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java
new file mode 100644
index 0000000..cd8a86c
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.PieDataset;
+
+
+public class PieData extends HomogeneousData<PieData, PieDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java
new file mode 100644
index 0000000..2ac6099
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.PolarDataset;
+
+
+public class PolarData extends HomogeneousData<PolarData, PolarDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java
new file mode 100644
index 0000000..fdec09c
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.RadarDataset;
+
+
+public class RadarData extends HomogeneousData<RadarData, RadarDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java
new file mode 100644
index 0000000..7895976
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.ScatterDataset;
+
+
+public class ScatterData extends HomogeneousData<ScatterData, ScatterDataset>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java
new file mode 100644
index 0000000..b2d9bdf
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.datapoint;
+
+public class BubbleDataPoint extends XYDataPointBase<BubbleDataPoint>
+{
+	private Number r;
+	
+	public BubbleDataPoint()
+	{
+	}
+	
+	public BubbleDataPoint(final Number x, final Number y, final Number r)
+	{
+		super(x, y);
+		this.r = r;
+	}
+	
+	public Number getR()
+	{
+		return this.r;
+	}
+	
+	/**
+	 * Radius of bubble
+	 */
+	public BubbleDataPoint setR(final Number r)
+	{
+		this.r = r;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java
new file mode 100644
index 0000000..080bdb1
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.datapoint;
+
+public class ScatterDataPoint extends XYDataPointBase<ScatterDataPoint>
+{
+	public ScatterDataPoint()
+	{
+	}
+	
+	public ScatterDataPoint(final Number x, final Number y)
+	{
+		super(x, y);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java
new file mode 100644
index 0000000..f8d43fc
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.datapoint;
+
+public class XYDataPoint extends XYDataPointBase<XYDataPoint>
+{
+	public XYDataPoint()
+	{
+	}
+	
+	public XYDataPoint(final Number x, final Number y)
+	{
+		super(x, y);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPointBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPointBase.java
new file mode 100644
index 0000000..150d2e0
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPointBase.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.datapoint;
+
+public abstract class XYDataPointBase<S extends XYDataPointBase<S>>
+{
+	private Number x;
+	private Number y;
+	
+	protected XYDataPointBase()
+	{
+	}
+	
+	protected XYDataPointBase(final Number x, final Number y)
+	{
+		this.setX(x);
+		this.setY(y);
+	}
+	
+	public Number getX()
+	{
+		return this.x;
+	}
+	
+	public S setX(final Number x)
+	{
+		this.x = x;
+		return this.self();
+	}
+	
+	public Number getY()
+	{
+		return this.y;
+	}
+	
+	public S setY(final Number y)
+	{
+		this.y = y;
+		return this.self();
+	}
+	
+	@SuppressWarnings("unchecked")
+	public S self()
+	{
+		return (S)this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BackgroundBorderHoverDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BackgroundBorderHoverDataset.java
new file mode 100644
index 0000000..e7f3a50
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BackgroundBorderHoverDataset.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.Arrays;
+import java.util.List;
+
+import software.xdev.chartjs.model.objects.OptionalArray;
+
+
+public abstract class BackgroundBorderHoverDataset<T extends BackgroundBorderHoverDataset<T, O>, O>
+	extends Dataset<T, O>
+{
+	protected final List<Object> backgroundColor = new OptionalArray<>();
+	protected final List<Object> borderColor = new OptionalArray<>();
+	protected final List<Integer> borderWidth = new OptionalArray<>();
+	protected final List<Object> hoverBackgroundColor = new OptionalArray<>();
+	protected final List<Object> hoverBorderColor = new OptionalArray<>();
+	protected final List<Integer> hoverBorderWidth = new OptionalArray<>();
+	
+	public List<Object> getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	public T addBackgroundColor(final Object backgroundColor)
+	{
+		if(backgroundColor != null)
+		{
+			this.backgroundColor.add(backgroundColor);
+		}
+		return this.self();
+	}
+	
+	public T addBackgroundColors(final Object... backgroundColors)
+	{
+		if(backgroundColors != null)
+		{
+			this.backgroundColor.addAll(Arrays.asList(backgroundColors));
+		}
+		return this.self();
+	}
+	
+	public T setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor.clear();
+		this.addBackgroundColor(backgroundColor);
+		return this.self();
+	}
+	
+	public T setBackgroundColor(final List<Object> backgroundColor)
+	{
+		this.backgroundColor.clear();
+		if(backgroundColor != null)
+		{
+			this.backgroundColor.addAll(backgroundColor);
+		}
+		return this.self();
+	}
+	
+	public List<Object> getBorderColor()
+	{
+		return this.borderColor;
+	}
+	
+	public T addBorderColor(final Object borderColor)
+	{
+		if(borderColor != null)
+		{
+			this.borderColor.add(borderColor);
+		}
+		return this.self();
+	}
+	
+	public T addBorderColors(final Object... borderColors)
+	{
+		if(borderColors != null)
+		{
+			this.borderColor.addAll(Arrays.asList(borderColors));
+		}
+		return this.self();
+	}
+	
+	public T setBorderColor(final Object borderColor)
+	{
+		this.borderColor.clear();
+		this.addBorderColor(borderColor);
+		return this.self();
+	}
+	
+	public T setBorderColor(final List<Object> borderColor)
+	{
+		this.borderColor.clear();
+		if(borderColor != null)
+		{
+			this.borderColor.addAll(borderColor);
+		}
+		return this.self();
+	}
+	
+	public List<Integer> getBorderWidth()
+	{
+		return this.borderWidth;
+	}
+	
+	public T addBorderWidth(final Integer borderWidth)
+	{
+		if(borderWidth != null)
+		{
+			this.borderWidth.add(borderWidth);
+		}
+		return this.self();
+	}
+	
+	public T setBorderWidth(final Integer borderWidth)
+	{
+		this.borderWidth.clear();
+		this.addBorderWidth(borderWidth);
+		return this.self();
+	}
+	
+	public T setBorderWidth(final List<Integer> borderWidth)
+	{
+		this.borderWidth.clear();
+		if(borderWidth != null)
+		{
+			this.borderWidth.addAll(borderWidth);
+		}
+		return this.self();
+	}
+	
+	public List<Object> getHoverBackgroundColor()
+	{
+		return this.hoverBackgroundColor;
+	}
+	
+	public T addHoverBackgroundColor(final Object hoverBackgroundColor)
+	{
+		if(hoverBackgroundColor != null)
+		{
+			this.hoverBackgroundColor.add(hoverBackgroundColor);
+		}
+		return this.self();
+	}
+	
+	public T setHoverBackgroundColor(final Object hoverBackgroundColor)
+	{
+		this.hoverBackgroundColor.clear();
+		this.addHoverBackgroundColor(hoverBackgroundColor);
+		return this.self();
+	}
+	
+	public T setHoverBackgroundColor(final List<Object> hoverBackgroundColor)
+	{
+		this.hoverBackgroundColor.clear();
+		if(hoverBackgroundColor != null)
+		{
+			this.hoverBackgroundColor.addAll(hoverBackgroundColor);
+		}
+		return this.self();
+	}
+	
+	public List<Object> getHoverBorderColor()
+	{
+		return this.hoverBorderColor;
+	}
+	
+	public T addHoverBorderColor(final Object hoverBorderColor)
+	{
+		if(hoverBorderColor != null)
+		{
+			this.hoverBorderColor.add(hoverBorderColor);
+		}
+		return this.self();
+	}
+	
+	public T setHoverBorderColor(final Object hoverBorderColor)
+	{
+		this.hoverBorderColor.clear();
+		this.addHoverBorderColor(hoverBorderColor);
+		return this.self();
+	}
+	
+	public T setHoverBorderColor(final List<Object> hoverBorderColor)
+	{
+		this.hoverBorderColor.clear();
+		if(hoverBorderColor != null)
+		{
+			this.hoverBorderColor.addAll(hoverBorderColor);
+		}
+		return this.self();
+	}
+	
+
+	public List<Integer> getHoverBorderWidth()
+	{
+		return this.hoverBorderWidth;
+	}
+	
+	public T addHoverBorderWidth(final Integer hoverBorderWidth)
+	{
+		if(hoverBorderWidth != null)
+		{
+			this.hoverBorderWidth.add(hoverBorderWidth);
+		}
+		return this.self();
+	}
+	
+	public T setHoverBorderWidth(final Integer hoverBorderWidth)
+	{
+		this.hoverBorderWidth.clear();
+		this.addHoverBorderWidth(hoverBorderWidth);
+		return this.self();
+	}
+	
+	public T setHoverBorderWidth(final List<Integer> hoverBorderWidth)
+	{
+		this.hoverBorderWidth.clear();
+		if(hoverBorderWidth != null)
+		{
+			this.hoverBorderWidth.addAll(hoverBorderWidth);
+		}
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java
new file mode 100644
index 0000000..44a4b22
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.List;
+
+import software.xdev.chartjs.model.enums.BorderSkipped;
+import software.xdev.chartjs.model.objects.OptionalArray;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L114">ChartJS Source</a>
+ */
+public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, Number>
+	implements NumberDataset<BarDataset>
+{
+	protected String xAxisID;
+	protected String yAxisID;
+	protected Number barPercentage;
+	protected Number categoryPercentage;
+	protected Object barThickness;
+	protected Number maxBarThickness;
+	protected Number minBarLength;
+	protected Object pointStyle;
+	protected Boolean grouped;
+	
+	protected final List<BorderSkipped> borderSkipped = new OptionalArray<>();
+	
+	@Override
+	protected String defaultType()
+	{
+		return "bar";
+	}
+	
+	public String getXAxisID()
+	{
+		return this.xAxisID;
+	}
+	
+	public BarDataset setXAxisID(final String xAxisID)
+	{
+		this.xAxisID = xAxisID;
+		return this;
+	}
+	
+	public String getYAxisID()
+	{
+		return this.yAxisID;
+	}
+	
+	public BarDataset setYAxisID(final String yAxisID)
+	{
+		this.yAxisID = yAxisID;
+		return this;
+	}
+	
+	public Number getBarPercentage()
+	{
+		return this.barPercentage;
+	}
+	
+	public BarDataset setBarPercentage(final Number barPercentage)
+	{
+		this.barPercentage = barPercentage;
+		return this;
+	}
+	
+	public Number getCategoryPercentage()
+	{
+		return this.categoryPercentage;
+	}
+	
+	public BarDataset setCategoryPercentage(final Number categoryPercentage)
+	{
+		this.categoryPercentage = categoryPercentage;
+		return this;
+	}
+	
+	public Object getBarThickness()
+	{
+		return this.barThickness;
+	}
+	
+	public BarDataset setBarThickness(final Object barThickness)
+	{
+		this.barThickness = barThickness;
+		return this;
+	}
+	
+	public Number getMaxBarThickness()
+	{
+		return this.maxBarThickness;
+	}
+	
+	public BarDataset setMaxBarThickness(final Number maxBarThickness)
+	{
+		this.maxBarThickness = maxBarThickness;
+		return this;
+	}
+	
+	public Number getMinBarLength()
+	{
+		return this.minBarLength;
+	}
+	
+	public BarDataset setMinBarLength(final Number minBarLength)
+	{
+		this.minBarLength = minBarLength;
+		return this;
+	}
+	
+	public Object getPointStyle()
+	{
+		return this.pointStyle;
+	}
+	
+	public BarDataset setPointStyle(final Object pointStyle)
+	{
+		this.pointStyle = pointStyle;
+		return this;
+	}
+	
+	public Boolean getGrouped()
+	{
+		return this.grouped;
+	}
+	
+	public BarDataset setGrouped(final Boolean grouped)
+	{
+		this.grouped = grouped;
+		return this;
+	}
+	
+	public List<BorderSkipped> getBorderSkipped()
+	{
+		return this.borderSkipped;
+	}
+	
+	public BarDataset addBorderSkipped(final BorderSkipped borderSkipped)
+	{
+		this.borderSkipped.add(borderSkipped);
+		return this;
+	}
+	
+	public BarDataset setBorderSkipped(final List<BorderSkipped> borderSkipped)
+	{
+		this.borderSkipped.clear();
+		if(borderSkipped != null)
+		{
+			this.borderSkipped.addAll(borderSkipped);
+		}
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BubbleDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BubbleDataset.java
new file mode 100644
index 0000000..2504a57
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BubbleDataset.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.List;
+
+import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
+import software.xdev.chartjs.model.objects.OptionalArray;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L165">ChartJS Source</a>
+ */
+public class BubbleDataset extends BackgroundBorderHoverDataset<BubbleDataset, BubbleDataPoint>
+{
+	protected String xAxisID;
+	protected String yAxisID;
+	
+	protected final List<Integer> hoverRadius = new OptionalArray<>();
+	
+	protected Object pointStyle;
+	
+	@Override
+	protected String defaultType()
+	{
+		return "bubble";
+	}
+	
+	public String getXAxisID()
+	{
+		return this.xAxisID;
+	}
+	
+	public BubbleDataset setXAxisID(final String xAxisID)
+	{
+		this.xAxisID = xAxisID;
+		return this;
+	}
+	
+	public String getYAxisID()
+	{
+		return this.yAxisID;
+	}
+	
+	public BubbleDataset setYAxisID(final String yAxisID)
+	{
+		this.yAxisID = yAxisID;
+		return this;
+	}
+	
+	/**
+	 * <p>
+	 * Additional radius to add to data radius on hover.
+	 * </p>
+	 *
+	 * <p>
+	 * Each BubbleDataPoint in this BubbleDataset uses the hoverRadius at its corresponding index.
+	 * </p>
+	 */
+	public BubbleDataset setHoverRadius(final List<Integer> hoverRadius)
+	{
+		this.hoverRadius.clear();
+		if(hoverRadius != null)
+		{
+			this.hoverRadius.addAll(hoverRadius);
+		}
+		return this;
+	}
+	
+	/**
+	 * @see BubbleDataset#setHoverRadius(List)
+	 */
+	public BubbleDataset addHoverRadius(final Integer hoverRadius)
+	{
+		this.hoverRadius.add(hoverRadius);
+		return this;
+	}
+	
+	public List<Integer> getHoverRadius()
+	{
+		return this.hoverRadius;
+	}
+	
+	public Object getPointStyle()
+	{
+		return this.pointStyle;
+	}
+	
+	public BubbleDataset setPointStyle(final Object pointStyle)
+	{
+		this.pointStyle = pointStyle;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/Dataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/Dataset.java
new file mode 100644
index 0000000..660c4eb
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/Dataset.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import software.xdev.chartjs.model.enums.IndexAxis;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L66">ChartJS Source</a>
+ */
+public abstract class Dataset<T extends Dataset<T, O>, O>
+{
+	protected String type;
+	protected final List<Object> data = new ArrayList<>();
+	
+	protected IndexAxis indexAxis;
+	protected Object clip;
+	protected String label;
+	protected Number order;
+	protected String stack;
+	protected Boolean hidden;
+	
+	protected abstract String defaultType();
+	
+	/**
+	 * Set's the default type
+	 */
+	public T withDefaultType()
+	{
+		return this.setType(this.defaultType());
+	}
+	
+	public String getType()
+	{
+		return this.type;
+	}
+	
+	/**
+	 * Sets the {@code type} of the dataset.
+	 * <p>
+	 * Usually only required for <a href="https://www.chartjs.org/docs/latest/charts/mixed.html">mixed charts</a>
+	 * </p>
+	 */
+	public T setType(final String type)
+	{
+		this.type = type;
+		return this.self();
+	}
+	
+	/**
+	 * @return an unmodifiable view of the data held in this {@code Dataset}, never {@code null}
+	 */
+	public List<Object> getData()
+	{
+		return Collections.unmodifiableList(this.data);
+	}
+	
+	/**
+	 * @return an unmodifiable view of the data held in this {@code Dataset}, never {@code null}
+	 */
+	public <X> List<X> getData(final Class<X> filterClazz)
+	{
+		return this.data.stream()
+			.filter(filterClazz::isInstance)
+			.map(filterClazz::cast)
+			.collect(Collectors.toUnmodifiableList());
+	}
+	
+	/**
+	 * @see #setData(Collection)
+	 */
+	public T setDataUnchecked(final Collection<?> data)
+	{
+		this.clearData();
+		if(data != null)
+		{
+			this.data.addAll(data);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * Sets the backing data list to the argument, replacing any data already added or set
+	 *
+	 * @param data The data to plot in a line
+	 */
+	public T setData(final Collection<O> data)
+	{
+		return this.setDataUnchecked(data);
+	}
+	
+	/**
+	 * @see #setData(Object[])
+	 */
+	public T setDataUnchecked(final Object... data)
+	{
+		return this.setDataUnchecked(Arrays.asList(data));
+	}
+	
+	/**
+	 * Sets the backing data list to the argument, replacing any data already added or set
+	 *
+	 * @param data The data to plot in a line
+	 */
+	@SuppressWarnings("unchecked") // Works fine
+	public T setData(final O... data)
+	{
+		return this.setData(Arrays.asList(data));
+	}
+	
+	/**
+	 * Remove all data held by this {@code Dataset}
+	 */
+	public T clearData()
+	{
+		this.data.clear();
+		return this.self();
+	}
+	
+	/**
+	 * @see #addData(Object)
+	 */
+	public T addDataUnchecked(final Object data)
+	{
+		this.data.add(data);
+		return this.self();
+	}
+	
+	/**
+	 * Add the data point to this {@code Dataset}
+	 *
+	 * @param data a {@code O}, can be {@code null} to signify absence of data for a given point
+	 * @see #setData(Collection)
+	 */
+	public T addData(final O data)
+	{
+		return this.addDataUnchecked(data);
+	}
+	
+	public IndexAxis getIndexAxis()
+	{
+		return this.indexAxis;
+	}
+	
+	public T setIndexAxis(final IndexAxis indexAxis)
+	{
+		this.indexAxis = indexAxis;
+		return this.self();
+	}
+	
+	public Object getClip()
+	{
+		return this.clip;
+	}
+	
+	public T setClip(final Object clip)
+	{
+		this.clip = clip;
+		return this.self();
+	}
+	
+	public String getLabel()
+	{
+		return this.label;
+	}
+	
+	public T setLabel(final String label)
+	{
+		this.label = label;
+		return this.self();
+	}
+	
+	public Number getOrder()
+	{
+		return this.order;
+	}
+	
+	public T setOrder(final Number order)
+	{
+		this.order = order;
+		return this.self();
+	}
+	
+	public String getStack()
+	{
+		return this.stack;
+	}
+	
+	public T setStack(final String stack)
+	{
+		this.stack = stack;
+		return this.self();
+	}
+	
+	public Boolean getHidden()
+	{
+		return this.hidden;
+	}
+	
+	public T setHidden(final Boolean hidden)
+	{
+		this.hidden = hidden;
+		return this.self();
+	}
+	
+	@SuppressWarnings("unchecked")
+	public T self()
+	{
+		return (T)this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDataset.java
new file mode 100644
index 0000000..2c06df8
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDataset.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+public class DoughnutDataset extends DoughnutDatasetBase<DoughnutDataset>
+	implements NumberDataset<DoughnutDataset>
+{
+	@Override
+	protected String defaultType()
+	{
+		return "doughnut";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDatasetBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDatasetBase.java
new file mode 100644
index 0000000..5e8f5af
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDatasetBase.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L248">ChartJS Source</a>
+ */
+public abstract class DoughnutDatasetBase<T extends DoughnutDatasetBase<T>>
+	extends BackgroundBorderHoverDataset<T, Number>
+	implements NumberDataset<T>
+{
+	protected Number circumference;
+	protected Object offset;
+	protected Number rotation;
+	protected Number weight;
+	protected Number spacing;
+	
+	public Number getCircumference()
+	{
+		return this.circumference;
+	}
+	
+	public T setCircumference(final Number circumference)
+	{
+		this.circumference = circumference;
+		return this.self();
+	}
+	
+	public Object getOffset()
+	{
+		return this.offset;
+	}
+	
+	public T setOffset(final Object offset)
+	{
+		this.offset = offset;
+		return this.self();
+	}
+	
+	public Number getRotation()
+	{
+		return this.rotation;
+	}
+	
+	public T setRotation(final Number rotation)
+	{
+		this.rotation = rotation;
+		return this.self();
+	}
+	
+	public Number getWeight()
+	{
+		return this.weight;
+	}
+	
+	public T setWeight(final Number weight)
+	{
+		this.weight = weight;
+		return this.self();
+	}
+	
+	public Number getSpacing()
+	{
+		return this.spacing;
+	}
+	
+	public T setSpacing(final Number spacing)
+	{
+		this.spacing = spacing;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDataset.java
new file mode 100644
index 0000000..ce54322
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDataset.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+public class LineDataset extends LineDatasetBase<LineDataset, Number> implements NumberDataset<LineDataset>
+{
+	@Override
+	protected String defaultType()
+	{
+		return "line";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java
new file mode 100644
index 0000000..5c185e9
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.List;
+
+import software.xdev.chartjs.model.objects.OptionalArray;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L190">ChartJS Source</a>
+ */
+public abstract class LineDatasetBase<T extends PointDataset<T, O>, O> extends PointDataset<T, O>
+{
+	protected String xAxisID;
+	protected String yAxisID;
+	protected Object spanGaps;
+	protected Boolean showLine;
+	
+	private final List<Integer> pointHitRadius = new OptionalArray<>();
+	
+	protected Number tension;
+	protected Object stepped;
+	
+	public String getXAxisID()
+	{
+		return this.xAxisID;
+	}
+	
+	public T setXAxisID(final String xAxisID)
+	{
+		this.xAxisID = xAxisID;
+		return this.self();
+	}
+	
+	public String getYAxisID()
+	{
+		return this.yAxisID;
+	}
+	
+	public T setYAxisID(final String yAxisID)
+	{
+		this.yAxisID = yAxisID;
+		return this.self();
+	}
+	
+	public Boolean getShowLine()
+	{
+		return this.showLine;
+	}
+	
+	public T setShowLine(final Boolean showLine)
+	{
+		this.showLine = showLine;
+		return this.self();
+	}
+	
+	public Object getSpanGaps()
+	{
+		return this.spanGaps;
+	}
+	
+	public T setSpanGaps(final Object spanGaps)
+	{
+		this.spanGaps = spanGaps;
+		return this.self();
+	}
+	
+	public Number getTension()
+	{
+		return this.tension;
+	}
+	
+	public T setTension(final Number tension)
+	{
+		this.tension = tension;
+		return this.self();
+	}
+	
+	public Object getStepped()
+	{
+		return this.stepped;
+	}
+	
+	public T setStepped(final Object stepped)
+	{
+		this.stepped = stepped;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointHitRadius(List)
+	 */
+	@Override
+	public List<Integer> getPointHitRadius()
+	{
+		return this.pointHitRadius;
+	}
+	
+	/**
+	 * @see #setPointHitRadius(List)
+	 */
+	@Override
+	public T addPointHitRadius(final Integer pointHitRadius)
+	{
+		this.pointHitRadius.add(pointHitRadius);
+		return this.self();
+	}
+	
+	/**
+	 * The pixel size of the non-displayed point that reacts to mouse events
+	 */
+	@Override
+	public T setPointHitRadius(final List<Integer> pointHitRadius)
+	{
+		this.pointHitRadius.clear();
+		if(pointHitRadius != null)
+		{
+			this.pointHitRadius.addAll(pointHitRadius);
+		}
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/NumberDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/NumberDataset.java
new file mode 100644
index 0000000..9e117a8
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/NumberDataset.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+
+public interface NumberDataset<S extends Dataset<?, Number>>
+{
+	S self();
+	
+	default S setData(final Number... data)
+	{
+		this.self().clearData();
+		if(data != null)
+		{
+			Arrays.stream(data).forEach(this::addData);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * Add the data point to this {@code Dataset}
+	 *
+	 * @see Dataset#setData(Collection)
+	 */
+	default S addData(final Number data)
+	{
+		this.self().addData(data);
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PieDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PieDataset.java
new file mode 100644
index 0000000..4ee4805
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PieDataset.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+public class PieDataset extends DoughnutDatasetBase<PieDataset>
+{
+	@Override
+	protected String defaultType()
+	{
+		return "pie";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PointDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PointDataset.java
new file mode 100644
index 0000000..361d037
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PointDataset.java
@@ -0,0 +1,558 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import software.xdev.chartjs.model.enums.BorderCapStyle;
+import software.xdev.chartjs.model.enums.BorderJoinStyle;
+import software.xdev.chartjs.model.objects.OptionalArray;
+import software.xdev.chartjs.model.options.elements.Fill;
+
+
+public abstract class PointDataset<T extends Dataset<T, O>, O> extends Dataset<T, O>
+{
+	private Fill<?> fill;
+	
+	private Float lineTension;
+	
+	private Object backgroundColor;
+	
+	private Integer borderWidth;
+	
+	private Object borderColor;
+	
+	private BorderCapStyle borderCapStyle;
+	
+	private final List<Integer> borderDash = new ArrayList<>();
+	
+	private Float borderDashOffset;
+	
+	private BorderJoinStyle borderJoinStyle;
+	
+	private final List<Object> pointBorderColor = new OptionalArray<>();
+	
+	private final List<Object> pointBackgroundColor = new OptionalArray<>();
+	
+	private final List<Integer> pointBorderWidth = new OptionalArray<>();
+	
+	private final List<Integer> pointRadius = new OptionalArray<>();
+	
+	private final List<Integer> pointHoverRadius = new OptionalArray<>();
+	
+	private final List<Integer> pointHitRadius = new OptionalArray<>();
+	
+	private final List<Object> pointHoverBackgroundColor = new OptionalArray<>();
+	
+	private final List<Object> pointHoverBorderColor = new OptionalArray<>();
+	
+	private final List<Integer> pointHoverBorderWidth = new OptionalArray<>();
+	
+	private final List<Object> pointStyle = new OptionalArray<>();
+	
+	/**
+	 * @see #setFill(Fill)
+	 */
+	public Fill getFill()
+	{
+		return this.fill;
+	}
+	
+	/**
+	 * If true, fill the area under the line
+	 */
+	public T setFill(final Fill<?> fill)
+	{
+		this.fill = fill;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setLineTension(Float)
+	 */
+	public Float getLineTension()
+	{
+		return this.lineTension;
+	}
+	
+	/**
+	 * Bezier curve tension of the line. Set to 0 to draw straightlines.
+	 */
+	public T setLineTension(final Float lineTension)
+	{
+		this.lineTension = lineTension;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setBackgroundColor(Object)
+	 */
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	/**
+	 * The fill color under the line.
+	 */
+	public T setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setBorderWidth(Integer)
+	 */
+	public Integer getBorderWidth()
+	{
+		return this.borderWidth;
+	}
+	
+	/**
+	 * The width of the line in pixels
+	 */
+	public T setBorderWidth(final Integer borderWidth)
+	{
+		this.borderWidth = borderWidth;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setBorderColor(Object)
+	 */
+	public Object getBorderColor()
+	{
+		return this.borderColor;
+	}
+	
+	/**
+	 * The color of the line.
+	 */
+	public T setBorderColor(final Object borderColor)
+	{
+		this.borderColor = borderColor;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setBorderCapStyle(BorderCapStyle)
+	 */
+	public BorderCapStyle getBorderCapStyle()
+	{
+		return this.borderCapStyle;
+	}
+	
+	/**
+	 * Default line cap style.
+	 * <ul>
+	 * <li>{@code butt} The ends of lines are squared off at the endpoints.
+	 * <li>{@code round} The ends of lines are rounded.
+	 * <li>{@code square} The ends of lines are squared off by adding a box with
+	 * an equal width and half the height of the line's thickness.
+	 * </ul>
+	 */
+	public T setBorderCapStyle(final BorderCapStyle borderCapStyle)
+	{
+		this.borderCapStyle = borderCapStyle;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setBorderDash(List)
+	 */
+	public List<Integer> getBorderDash()
+	{
+		return this.borderDash;
+	}
+	
+	/**
+	 * @see #setBorderDash(List)
+	 */
+	public T addBorderDash(final Integer borderDash)
+	{
+		this.borderDash.add(borderDash);
+		return this.self();
+	}
+	
+	/**
+	 * Default line dash. A list of numbers that specifies distances to alternately draw a line and a gap (in
+	 * coordinate
+	 * space units). If the number of elements in the array is odd, the elements of the array get copied and
+	 * concatenated. For example, [5, 15, 25] will become [5, 15, 25, 5, 15, 25].
+	 */
+	public T setBorderDash(final List<Integer> borderDash)
+	{
+		this.borderDash.clear();
+		if(borderDash != null)
+		{
+			this.borderDash.addAll(borderDash);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setBorderDashOffset(Float)
+	 */
+	public Float getBorderDashOffset()
+	{
+		return this.borderDashOffset;
+	}
+	
+	/**
+	 * Default line dash offset. A float specifying the amount of the offset. Initially 0.0.
+	 */
+	public T setBorderDashOffset(final Float borderDashOffset)
+	{
+		this.borderDashOffset = borderDashOffset;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setBorderJoinStyle(BorderJoinStyle)
+	 */
+	public BorderJoinStyle getBorderJoinStyle()
+	{
+		return this.borderJoinStyle;
+	}
+	
+	/**
+	 * <p>
+	 * Default line join style.
+	 * </p>
+	 * <ul>
+	 * <li>{@code round} Rounds off the corners of a shape by filling an
+	 * additional sector of disc centered at the common endpoint of connected
+	 * segments. The radius for these rounded corners is equal to the line
+	 * width.
+	 * <li>{@code bevel} Fills an additional triangular area between the common
+	 * endpoint of connected segments, and the separate outside rectangular
+	 * corners of each segment.
+	 * <li>{@code miter} Connected segments are joined by extending their
+	 * outside edges to connect at a single point, with the effect of filling an
+	 * additional lozenge-shaped area. This setting is effected by the
+	 * miterLimit property.
+	 * </ul>
+	 */
+	public T setBorderJoinStyle(final BorderJoinStyle borderJoinStyle)
+	{
+		this.borderJoinStyle = borderJoinStyle;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointBorderColor(List)
+	 */
+	public List<Object> getPointBorderColor()
+	{
+		return this.pointBorderColor;
+	}
+	
+	/**
+	 * @see #setPointBorderColor(List)
+	 */
+	public T addPointBorderColor(final Object pointBorderColor)
+	{
+		this.pointBorderColor.add(pointBorderColor);
+		return this.self();
+	}
+	
+	/**
+	 * The border color for points.
+	 */
+	public T setPointBorderColor(final List<Object> pointBorderColor)
+	{
+		this.pointBorderColor.clear();
+		if(pointBorderColor != null)
+		{
+			this.pointBorderColor.addAll(pointBorderColor);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointBackgroundColor(List)
+	 */
+	public List<Object> getPointBackgroundColor()
+	{
+		return this.pointBackgroundColor;
+	}
+	
+	/**
+	 * @see #setPointBackgroundColor(List)
+	 */
+	public T addPointBackgroundColor(final Object pointBackgroundColor)
+	{
+		this.pointBackgroundColor.add(pointBackgroundColor);
+		return this.self();
+	}
+	
+	/**
+	 * The fill color for points
+	 */
+	public T setPointBackgroundColor(final List<Object> pointBackgroundColor)
+	{
+		this.pointBackgroundColor.clear();
+		if(pointBackgroundColor != null)
+		{
+			this.pointBackgroundColor.addAll(pointBackgroundColor);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointBorderWidth(List)
+	 */
+	public List<Integer> getPointBorderWidth()
+	{
+		return this.pointBorderWidth;
+	}
+	
+	/**
+	 * @see #setPointBorderWidth(List)
+	 */
+	public T addPointBorderWidth(final Integer pointBorderWidth)
+	{
+		this.pointBorderWidth.add(pointBorderWidth);
+		return this.self();
+	}
+	
+	/**
+	 * The width of the point border in pixels
+	 */
+	public T setPointBorderWidth(final List<Integer> pointBorderWidth)
+	{
+		this.pointBorderWidth.clear();
+		if(pointBorderWidth != null)
+		{
+			this.pointBorderWidth.addAll(pointBorderWidth);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointRadius(List)
+	 */
+	public List<Integer> getPointRadius()
+	{
+		return this.pointRadius;
+	}
+	
+	/**
+	 * @see #setPointRadius(List)
+	 */
+	public T addPointRadius(final Integer pointRadius)
+	{
+		this.pointRadius.add(pointRadius);
+		return this.self();
+	}
+	
+	/**
+	 * The radius of the point shape. If set to 0, nothing is rendered.
+	 */
+	public T setPointRadius(final List<Integer> pointRadius)
+	{
+		this.pointRadius.clear();
+		if(pointRadius != null)
+		{
+			this.pointRadius.addAll(pointRadius);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointHoverRadius(List)
+	 */
+	public List<Integer> getPointHoverRadius()
+	{
+		return this.pointHoverRadius;
+	}
+	
+	/**
+	 * @see #setPointHoverRadius(List)
+	 */
+	public T addPointHoverRadius(final Integer pointHoverRadius)
+	{
+		this.pointHoverRadius.add(pointHoverRadius);
+		return this.self();
+	}
+	
+	/**
+	 * The radius of the point when hovered
+	 */
+	public T setPointHoverRadius(final List<Integer> pointHoverRadius)
+	{
+		this.pointHoverRadius.clear();
+		if(pointHoverRadius != null)
+		{
+			this.pointHoverRadius.addAll(pointHoverRadius);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointHitRadius(List)
+	 */
+	public List<Integer> getPointHitRadius()
+	{
+		return this.pointHitRadius;
+	}
+	
+	/**
+	 * @see #setPointHitRadius(List)
+	 */
+	public T addPointHitRadius(final Integer pointHitRadius)
+	{
+		this.pointHitRadius.add(pointHitRadius);
+		return this.self();
+	}
+	
+	/**
+	 * The pixel size of the non-displayed point that reacts to mouse events
+	 */
+	public T setPointHitRadius(final List<Integer> pointHitRadius)
+	{
+		this.pointHitRadius.clear();
+		if(pointHitRadius != null)
+		{
+			this.pointHitRadius.addAll(pointHitRadius);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointHoverBackgroundColor(List)
+	 */
+	public List<Object> getPointHoverBackgroundColor()
+	{
+		return this.pointHoverBackgroundColor;
+	}
+	
+	/**
+	 * @see #setPointHoverBackgroundColor(List)
+	 */
+	public T addPointHoverBackgroundColor(final Object pointHoverBackgroundColor)
+	{
+		this.pointHoverBackgroundColor.add(pointHoverBackgroundColor);
+		return this.self();
+	}
+	
+	/**
+	 * Point background color when hovered
+	 */
+	public T setPointHoverBackgroundColor(final List<Object> pointHoverBackgroundColor)
+	{
+		this.pointHoverBackgroundColor.clear();
+		if(pointHoverBackgroundColor != null)
+		{
+			this.pointHoverBackgroundColor.addAll(pointHoverBackgroundColor);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointHoverBorderColor(List)
+	 */
+	public List<Object> getPointHoverBorderColor()
+	{
+		return this.pointHoverBorderColor;
+	}
+	
+	/**
+	 * @see #setPointHoverBorderColor(List)
+	 */
+	public T addPointHoverBorderColor(final Object pointHoverBorderColor)
+	{
+		this.pointHoverBorderColor.add(pointHoverBorderColor);
+		return this.self();
+	}
+	
+	/**
+	 * Point border color when hovered
+	 */
+	public T setPointHoverBorderColor(final List<Object> pointHoverBorderColor)
+	{
+		this.pointHoverBorderColor.clear();
+		if(pointHoverBorderColor != null)
+		{
+			this.pointHoverBorderColor.addAll(pointHoverBorderColor);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointHoverBorderWidth(List)
+	 */
+	public List<Integer> getPointHoverBorderWidth()
+	{
+		return this.pointHoverBorderWidth;
+	}
+	
+	/**
+	 * @see #setPointHoverBorderWidth(List)
+	 */
+	public T addPointHoverBorderWidth(final Integer pointHoverBorderWidth)
+	{
+		this.pointHoverBorderWidth.add(pointHoverBorderWidth);
+		return this.self();
+	}
+	
+	/**
+	 * Border width of point when hovered
+	 */
+	public T setPointHoverBorderWidth(final List<Integer> pointHoverBorderWidth)
+	{
+		this.pointHoverBorderWidth.clear();
+		if(pointHoverBorderWidth != null)
+		{
+			this.pointHoverBorderWidth.addAll(pointHoverBorderWidth);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPointStyle(List)
+	 */
+	public List<Object> getPointStyle()
+	{
+		return this.pointStyle;
+	}
+	
+	/**
+	 * @see #setPointStyle(List)
+	 */
+	public T addPointStyle(final Object pointStyle)
+	{
+		this.pointStyle.add(pointStyle);
+		return this.self();
+	}
+	
+	/**
+	 * The style of point. Options are 'circle', 'triangle', 'rect', 'rectRot', 'cross', 'crossRot', 'star', 'line',
+	 * and
+	 * 'dash'. If the option is an image, that image is drawn on the canvas using drawImage.
+	 */
+	public T setPointStyle(final List<Object> pointStyle)
+	{
+		this.pointStyle.clear();
+		if(pointStyle != null)
+		{
+			this.pointStyle.addAll(pointStyle);
+		}
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PolarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PolarDataset.java
new file mode 100644
index 0000000..74195cd
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PolarDataset.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L372">ChartJS Source</a>
+ */
+public class PolarDataset extends BackgroundBorderHoverDataset<PolarDataset, Number>
+	implements NumberDataset<PolarDataset>
+{
+	protected Number angle;
+	
+	@Override
+	protected String defaultType()
+	{
+		return "polarArea";
+	}
+	
+	public Number getAngle()
+	{
+		return this.angle;
+	}
+	
+	public PolarDataset setAngle(final Number angle)
+	{
+		this.angle = angle;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/RadarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/RadarDataset.java
new file mode 100644
index 0000000..dfa6602
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/RadarDataset.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L401">ChartJS Source</a>
+ */
+public class RadarDataset extends PointDataset<RadarDataset, Number> implements NumberDataset<RadarDataset>
+{
+	protected String xAxisID;
+	protected String yAxisID;
+	protected Object spanGaps;
+	protected Boolean showLine;
+	
+	private final List<Integer> hitRadius = new ArrayList<>();
+	
+	@Override
+	protected String defaultType()
+	{
+		return "radar";
+	}
+	
+	public String getXAxisID()
+	{
+		return this.xAxisID;
+	}
+	
+	public RadarDataset setXAxisID(final String xAxisID)
+	{
+		this.xAxisID = xAxisID;
+		return this;
+	}
+	
+	public String getYAxisID()
+	{
+		return this.yAxisID;
+	}
+	
+	public RadarDataset setYAxisID(final String yAxisID)
+	{
+		this.yAxisID = yAxisID;
+		return this;
+	}
+	
+	public Object getSpanGaps()
+	{
+		return this.spanGaps;
+	}
+	
+	public RadarDataset setSpanGaps(final Object spanGaps)
+	{
+		this.spanGaps = spanGaps;
+		return this;
+	}
+	
+	public Boolean getShowLine()
+	{
+		return this.showLine;
+	}
+	
+	public RadarDataset setShowLine(final Boolean showLine)
+	{
+		this.showLine = showLine;
+		return this;
+	}
+	
+	public List<Integer> getHitRadius()
+	{
+		return this.hitRadius;
+	}
+	
+	public RadarDataset addHitRadius(final Integer hitRadius)
+	{
+		this.hitRadius.add(hitRadius);
+		return this;
+	}
+	
+	/**
+	 * The pixel size of the non-displayed point that reacts to mouse events
+	 */
+	public RadarDataset setHitRadius(final List<Integer> hitRadius)
+	{
+		this.hitRadius.clear();
+		if(hitRadius != null)
+		{
+			this.hitRadius.addAll(hitRadius);
+		}
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/ScatterDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/ScatterDataset.java
new file mode 100644
index 0000000..30cfae6
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/ScatterDataset.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.dataset;
+
+import software.xdev.chartjs.model.datapoint.ScatterDataPoint;
+
+
+public class ScatterDataset extends LineDatasetBase<ScatterDataset, ScatterDataPoint>
+{
+	@Override
+	protected String defaultType()
+	{
+		return "scatter";
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderCapStyle.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderCapStyle.java
new file mode 100644
index 0000000..430054f
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderCapStyle.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum BorderCapStyle
+{
+	
+	/***
+	 * The ends of lines are squared off at the endpoints.
+	 */
+	BUTT,
+	
+	/**
+	 * The ends of lines are rounded.
+	 */
+	ROUND,
+	
+	/**
+	 * The ends of lines are squared off by adding a box with an equal width and half the height of the line's
+	 * thickness.
+	 */
+	SQUARE;
+	
+	private final String serialized;
+	
+	BorderCapStyle()
+	{
+		this.serialized = this.name().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.serialized;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderJoinStyle.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderJoinStyle.java
new file mode 100644
index 0000000..e6c84e1
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderJoinStyle.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum BorderJoinStyle
+{
+	
+	/**
+	 * Rounds off the corners of a shape by filling an additional sector of disc centered at the common endpoint of
+	 * connected segments. The radius for these rounded corners is equal to the line width.
+	 */
+	ROUND,
+	
+	/**
+	 * Fills an additional triangular area between the common endpoint of connected segments, and the separate outside
+	 * rectangular corners of each segment.
+	 */
+	BEVEL,
+	
+	/**
+	 * Connected segments are joined by extending their outside edges to connect at a single point, with the effect of
+	 * filling an additional lozenge-shaped area. This setting is effected by the miterLimit property.
+	 */
+	MITER;
+	
+	private final String serialized;
+	
+	BorderJoinStyle()
+	{
+		this.serialized = this.name().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.serialized;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderSkipped.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderSkipped.java
new file mode 100644
index 0000000..7909f1a
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/BorderSkipped.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum BorderSkipped
+{
+	BOTTOM,
+	LEFT,
+	TOP,
+	RIGHT;
+	
+	private final String serialized;
+	
+	BorderSkipped()
+	{
+		this.serialized = this.name().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.serialized;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/Easing.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/Easing.java
new file mode 100644
index 0000000..7e97701
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/Easing.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import software.xdev.chartjs.model.EnumNameToCamelCase;
+
+
+/**
+ * Enumeration of easing functions, based on Robert Penner's
+ * <a href="http://robertpenner.com/easing/">list</a>
+ */
+public enum Easing
+{
+	
+	LINEAR,
+	EASE_IN_QUAD,
+	EASE_OUT_QUAD,
+	EASE_IN_OUT_QUAD,
+	EASE_IN_CUBIC,
+	EASE_OUT_CUBIC,
+	EASE_IN_OUT_CUBIC,
+	EASE_IN_QUART,
+	EASE_OUT_QUART,
+	EASE_IN_OUT_QUART,
+	EASE_IN_QUINT,
+	EASE_OUT_QUINT,
+	EASE_IN_OUT_QUINT,
+	EASE_IN_SINE,
+	EASE_OUT_SINE,
+	EASE_IN_OUT_SINE,
+	EASE_IN_EXPO,
+	EASE_OUT_EXPO,
+	EASE_IN_OUT_EXPO,
+	EASE_IN_CIRC,
+	EASE_OUT_CIRC,
+	EASE_IN_OUT_CIRC,
+	EASE_IN_ELASTIC,
+	EASE_OUT_ELASTIC,
+	EASE_IN_OUT_ELASTIC,
+	EASE_IN_BACK,
+	EASE_OUT_BACK,
+	EASE_IN_OUT_BACK,
+	EASE_IN_BOUNCE,
+	EASE_OUT_BOUNCE,
+	EASE_IN_OUT_BOUNCE;
+	
+	@JsonValue
+	@Override
+	public String toString()
+	{
+		return EnumNameToCamelCase.getName(this);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/FillMode.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/FillMode.java
new file mode 100644
index 0000000..dfc978c
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/FillMode.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum FillMode
+{
+	ORIGIN,
+	START,
+	END;
+	
+	private final String serialized;
+	
+	FillMode()
+	{
+		this.serialized = this.name().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.serialized;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/FontStyle.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/FontStyle.java
new file mode 100644
index 0000000..33e3698
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/FontStyle.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum FontStyle
+{
+	BOLD,
+	NORMAL,
+	ITALIC,
+	OBLIQUE,
+	INITIAL,
+	INHERIT;
+	
+	private final String serialized;
+	
+	FontStyle()
+	{
+		this.serialized = this.name().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.serialized;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/HoverMode.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/HoverMode.java
new file mode 100644
index 0000000..99cd8af
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/HoverMode.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum HoverMode
+{
+	
+	/**
+	 * highlights the closest element
+	 */
+	SINGLE,
+	
+	/**
+	 * highlights elements in all datasets at the same X value
+	 */
+	LABEL,
+	
+	/**
+	 * highlights elements in all datasets at the same X value, activates when hovering anywhere within the vertical
+	 * slice of the x-axis representing that X value.
+	 */
+	X_AXIS,
+	
+	/**
+	 * highlights the closest dataset
+	 */
+	DATASET;
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.name().toLowerCase(Locale.ENGLISH);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/IndexAxis.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/IndexAxis.java
new file mode 100644
index 0000000..c84c737
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/IndexAxis.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum IndexAxis
+{
+	X,
+	Y;
+	
+	@JsonValue
+	@Override
+	public String toString()
+	{
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/PointStyle.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/PointStyle.java
new file mode 100644
index 0000000..173269f
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/PointStyle.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import software.xdev.chartjs.model.EnumNameToCamelCase;
+
+
+/**
+ * @apiNote Only contains the (string) constants. Other valid values are e.g. <code>false</code>, an image element or a
+ * canvas element.
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L1968">ChartJS Source</a>
+ */
+public enum PointStyle
+{
+	CIRCLE,
+	CROSS,
+	CROSS_ROT,
+	DASH,
+	LINE,
+	RECT,
+	RECT_ROUNDED,
+	RECT_ROT,
+	STAR,
+	TRIANGLE;
+	
+	@JsonValue
+	@Override
+	public String toString()
+	{
+		return EnumNameToCamelCase.getName(this);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/ScaleLabelAlignment.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/ScaleLabelAlignment.java
new file mode 100644
index 0000000..7fd024d
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/ScaleLabelAlignment.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum ScaleLabelAlignment
+{
+	
+	START,
+	CENTER,
+	END;
+	
+	private final String serialized;
+	
+	ScaleLabelAlignment()
+	{
+		this.serialized = this.name().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.serialized;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/ScalesPosition.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/ScalesPosition.java
new file mode 100644
index 0000000..914d0a3
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/ScalesPosition.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.enums;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum ScalesPosition
+{
+	TOP,
+	LEFT,
+	BOTTOM,
+	RIGHT;
+	
+	private final String serialized;
+	
+	private ScalesPosition()
+	{
+		this.serialized = this.name().toLowerCase(Locale.ENGLISH);
+	}
+	
+	@Override
+	@JsonValue
+	public String toString()
+	{
+		return this.serialized;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/javascript/JavaScriptFunction.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/javascript/JavaScriptFunction.java
new file mode 100644
index 0000000..61a76ee
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/javascript/JavaScriptFunction.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.javascript;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+@JsonSerialize(using = JavaScriptFunction.Serializer.class)
+public class JavaScriptFunction
+{
+	private final String function;
+	
+	public JavaScriptFunction(final String function)
+	{
+		this.function = function;
+	}
+	
+	public String getFunction()
+	{
+		return this.function;
+	}
+	
+	public static class Serializer extends JsonSerializer<JavaScriptFunction>
+	{
+		@Override
+		public void serialize(
+			final JavaScriptFunction value,
+			final JsonGenerator gen,
+			final SerializerProvider serializers) throws IOException
+		{
+			gen.writeRawValue(value.function);
+		}
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/objects/OptionalArray.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/objects/OptionalArray.java
new file mode 100644
index 0000000..8f8a152
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/objects/OptionalArray.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.objects;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * {@link ArrayList} subclass with special serialization behavior: if only one item is contained, the item will be
+ * serialized as a single value.
+ */
+@JsonSerialize(using = OptionalArray.Serializer.class)
+public class OptionalArray<E> extends ArrayList<E>
+{
+	private static final long serialVersionUID = 1470940649764L;
+	
+	
+	public static class Serializer<T> extends JsonSerializer<OptionalArray<T>>
+	{
+		
+		@Override
+		public boolean isEmpty(final SerializerProvider provider, final OptionalArray<T> value)
+		{
+			return value == null || value.isEmpty();
+		}
+		
+		@Override
+		public void serialize(
+			final OptionalArray<T> value,
+			final JsonGenerator jgen,
+			final SerializerProvider provider)
+			throws IOException
+		{
+			if(value != null && !value.isEmpty())
+			{
+				if(value.size() == 1)
+				{
+					jgen.writeObject(value.get(0));
+				}
+				else
+				{
+					jgen.writeStartArray();
+					for(final T t : value)
+					{
+						jgen.writeObject(t);
+					}
+					jgen.writeEndArray();
+				}
+			}
+		}
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/BarOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/BarOptions.java
new file mode 100644
index 0000000..65ea06f
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/BarOptions.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.DefaultAnimation;
+import software.xdev.chartjs.model.options.elements.BarElements;
+
+
+public class BarOptions extends Options<BarOptions, DefaultAnimation>
+{
+	protected BarElements elements;
+	
+	/**
+	 * @return {@link BarElements} instance, or {@code null} if not set
+	 */
+	public BarElements getElements()
+	{
+		return this.elements;
+	}
+	
+	public BarOptions setElements(final BarElements elements)
+	{
+		this.elements = elements;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/BubbleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/BubbleOptions.java
new file mode 100644
index 0000000..dc5caa2
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/BubbleOptions.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.DefaultAnimation;
+import software.xdev.chartjs.model.options.elements.BubbleElements;
+
+
+/**
+ * The bubble chart has no unique configuration options. To configure options common to all of the bubbles, the point
+ * element options are used.
+ * <p>
+ * For example, to give all bubbles a 1px wide black border, the following options would be used.
+ * <p>
+ * new Chart(ctx,{ type:"bubble", options: { elements: { points: { borderWidth: 1, borderColor: 'rgb(0, 0, 0)' } } }
+ * });
+ */
+public class BubbleOptions extends Options<BubbleOptions, DefaultAnimation>
+{
+	protected BubbleElements elements;
+	
+	public BubbleElements getElements()
+	{
+		return this.elements;
+	}
+	
+	public BubbleOptions setElements(final BubbleElements elements)
+	{
+		this.elements = elements;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Callbacks.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Callbacks.java
new file mode 100644
index 0000000..8f1dada
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Callbacks.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+
+
+public class Callbacks
+{
+	protected JavaScriptFunction beforeTitle;
+	protected JavaScriptFunction title;
+	protected JavaScriptFunction afterTitle;
+	protected JavaScriptFunction beforeBody;
+	protected JavaScriptFunction beforeLabel;
+	protected JavaScriptFunction label;
+	protected JavaScriptFunction labelColor;
+	protected JavaScriptFunction labelTextColor;
+	protected JavaScriptFunction afterLabel;
+	protected JavaScriptFunction afterBody;
+	protected JavaScriptFunction beforeFooter;
+	protected JavaScriptFunction footer;
+	protected JavaScriptFunction afterFooter;
+	
+	/**
+	 * @see #setBeforeTitle(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getBeforeTitle()
+	{
+		return this.beforeTitle;
+	}
+	
+	/**
+	 * <p>
+	 * Returns the text to render before the title.
+	 * </p>
+	 */
+	public Callbacks setBeforeTitle(final JavaScriptFunction beforeTitle)
+	{
+		this.beforeTitle = beforeTitle;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitle(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getTitle()
+	{
+		return this.title;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render as the title of the tooltip.
+	 * </p>
+	 */
+	public Callbacks setTitle(final JavaScriptFunction title)
+	{
+		this.title = title;
+		return this;
+	}
+	
+	/**
+	 * @see #setAfterTitle(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getAfterTitle()
+	{
+		return this.afterTitle;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render after the title.
+	 * </p>
+	 */
+	public Callbacks setAfterTitle(final JavaScriptFunction afterTitle)
+	{
+		this.afterTitle = afterTitle;
+		return this;
+	}
+	
+	/**
+	 * @see #setBeforeBody(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getBeforeBody()
+	{
+		return this.beforeBody;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render before the body section.
+	 * </p>
+	 */
+	public Callbacks setBeforeBody(final JavaScriptFunction beforeBody)
+	{
+		this.beforeBody = beforeBody;
+		return this;
+	}
+	
+	/**
+	 * @see #setBeforeLabel(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getBeforeLabel()
+	{
+		return this.beforeLabel;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render before an individual label. This will be called for each item in the tooltip.
+	 * </p>
+	 */
+	public Callbacks setBeforeLabel(final JavaScriptFunction beforeLabel)
+	{
+		this.beforeLabel = beforeLabel;
+		return this;
+	}
+	
+	/**
+	 * @see #setLabel(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getLabel()
+	{
+		return this.label;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render for an individual item in the tooltip.
+	 * </p>
+	 */
+	public Callbacks setLabel(final JavaScriptFunction label)
+	{
+		this.label = label;
+		return this;
+	}
+	
+	/**
+	 * @see #setLabelColor(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getLabelColor()
+	{
+		return this.labelColor;
+	}
+	
+	/**
+	 * <p>
+	 * Returns the colors to render for the tooltip item.
+	 * </p>
+	 */
+	public Callbacks setLabelColor(final JavaScriptFunction labelColor)
+	{
+		this.labelColor = labelColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setLabelTextColor(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getLabelTextColor()
+	{
+		return this.labelTextColor;
+	}
+	
+	/**
+	 * <p>
+	 * Returns the colors for the text of the label for the tooltip item.
+	 * </p>
+	 */
+	public Callbacks setLabelTextColor(final JavaScriptFunction labelTextColor)
+	{
+		this.labelTextColor = labelTextColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setAfterLabel(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getAfterLabel()
+	{
+		return this.afterLabel;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render after an individual label.
+	 * </p>
+	 */
+	public Callbacks setAfterLabel(final JavaScriptFunction afterLabel)
+	{
+		this.afterLabel = afterLabel;
+		return this;
+	}
+	
+	/**
+	 * @see #setAfterBody(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getAfterBody()
+	{
+		return this.afterBody;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render after the body section.
+	 * </p>
+	 */
+	public Callbacks setAfterBody(final JavaScriptFunction afterBody)
+	{
+		this.afterBody = afterBody;
+		return this;
+	}
+	
+	/**
+	 * @see #setBeforeFooter(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getBeforeFooter()
+	{
+		return this.beforeFooter;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render before the footer section.
+	 * </p>
+	 */
+	public Callbacks setBeforeFooter(final JavaScriptFunction beforeFooter)
+	{
+		this.beforeFooter = beforeFooter;
+		return this;
+	}
+	
+	/**
+	 * @see #setFooter(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getFooter()
+	{
+		return this.footer;
+	}
+	
+	/**
+	 * <p>
+	 * Returns text to render as the footer of the tooltip.
+	 * </p>
+	 */
+	public Callbacks setFooter(final JavaScriptFunction footer)
+	{
+		this.footer = footer;
+		return this;
+	}
+	
+	/**
+	 * @see #setAfterFooter(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getAfterFooter()
+	{
+		return this.afterFooter;
+	}
+	
+	/**
+	 * <p>
+	 * Text to render after the footer section.
+	 * </p>
+	 */
+	public Callbacks setAfterFooter(final JavaScriptFunction afterFooter)
+	{
+		this.afterFooter = afterFooter;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/CoreInteractionOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/CoreInteractionOptions.java
new file mode 100644
index 0000000..5145f8b
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/CoreInteractionOptions.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.6/src/types/index.d.ts#L1564">ChartJS Source</a>
+ */
+public class CoreInteractionOptions
+{
+	protected String mode;
+	protected Boolean intersect;
+	protected String axis;
+	protected Boolean includeInvisible;
+	
+	public String getMode()
+	{
+		return this.mode;
+	}
+	
+	public CoreInteractionOptions setMode(final String mode)
+	{
+		this.mode = mode;
+		return this;
+	}
+	
+	public Boolean getIntersect()
+	{
+		return this.intersect;
+	}
+	
+	public CoreInteractionOptions setIntersect(final Boolean intersect)
+	{
+		this.intersect = intersect;
+		return this;
+	}
+	
+	public String getAxis()
+	{
+		return this.axis;
+	}
+	
+	public CoreInteractionOptions setAxis(final String axis)
+	{
+		this.axis = axis;
+		return this;
+	}
+	
+	public Boolean getIncludeInvisible()
+	{
+		return this.includeInvisible;
+	}
+	
+	public CoreInteractionOptions setIncludeInvisible(final Boolean includeInvisible)
+	{
+		this.includeInvisible = includeInvisible;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/DoughnutOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/DoughnutOptions.java
new file mode 100644
index 0000000..fa9b109
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/DoughnutOptions.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.DoughnutAnimation;
+
+
+public class DoughnutOptions extends DoughnutOptionsBase<DoughnutOptions, DoughnutAnimation>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/DoughnutOptionsBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/DoughnutOptionsBase.java
new file mode 100644
index 0000000..ceca81d
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/DoughnutOptionsBase.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.DoughnutAnimationBase;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.6/src/types/index.d.ts#L298">ChartJS Source</a>
+ */
+public abstract class DoughnutOptionsBase<O extends DoughnutOptionsBase<O, A>, A extends DoughnutAnimationBase<A>>
+	extends Options<O, A>
+{
+	protected Number circumference;
+	protected Object cutout; // number or string
+	protected Object offset; // number or number[]
+	protected Object radius; // number or string
+	protected Number rotation;
+	protected Number spacing;
+	
+	public Number getCircumference()
+	{
+		return this.circumference;
+	}
+	
+	public DoughnutOptionsBase<O, A> setCircumference(final Number circumference)
+	{
+		this.circumference = circumference;
+		return this.self();
+	}
+	
+	public Object getCutout()
+	{
+		return this.cutout;
+	}
+	
+	public DoughnutOptionsBase<O, A> setCutout(final Object cutout)
+	{
+		this.cutout = cutout;
+		return this.self();
+	}
+	
+	public Object getOffset()
+	{
+		return this.offset;
+	}
+	
+	public DoughnutOptionsBase<O, A> setOffset(final Object offset)
+	{
+		this.offset = offset;
+		return this.self();
+	}
+	
+	public Object getRadius()
+	{
+		return this.radius;
+	}
+	
+	public DoughnutOptionsBase<O, A> setRadius(final Object radius)
+	{
+		this.radius = radius;
+		return this.self();
+	}
+	
+	public Number getRotation()
+	{
+		return this.rotation;
+	}
+	
+	public DoughnutOptionsBase<O, A> setRotation(final Number rotation)
+	{
+		this.rotation = rotation;
+		return this.self();
+	}
+	
+	public Number getSpacing()
+	{
+		return this.spacing;
+	}
+	
+	public DoughnutOptionsBase<O, A> setSpacing(final Number spacing)
+	{
+		this.spacing = spacing;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Font.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Font.java
new file mode 100644
index 0000000..a2c52f2
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Font.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.enums.FontStyle;
+
+
+public class Font
+{
+	protected String family;
+	protected Number size;
+	protected FontStyle style;
+	protected Number weight;
+	protected String lineHeight;
+	
+	public String getFamily()
+	{
+		return this.family;
+	}
+	
+	/**
+	 * <p>
+	 * Font family for the scale title, follows CSS font-family options.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"}
+	 * </p>
+	 */
+	public Font setFamily(final String family)
+	{
+		this.family = family;
+		return this;
+	}
+	
+	public Number getSize()
+	{
+		return this.size;
+	}
+	
+	/**
+	 * <p>
+	 * Font size for the scale title.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 12}
+	 * </p>
+	 */
+	public Font setSize(final Number size)
+	{
+		this.size = size;
+		return this;
+	}
+	
+	public FontStyle getStyle()
+	{
+		return this.style;
+	}
+	
+	/**
+	 * <p>
+	 * Font style for the scale title, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "normal"}
+	 * </p>
+	 */
+	public Font setStyle(final FontStyle style)
+	{
+		this.style = style;
+		return this;
+	}
+	
+	public Number getWeight()
+	{
+		return this.weight;
+	}
+	
+	public Font setWeight(final Number weight)
+	{
+		this.weight = weight;
+		return this;
+	}
+	
+	/**
+	 * @see #setLineHeight(String)
+	 */
+	public String getLineHeight()
+	{
+		return this.lineHeight;
+	}
+	
+	/**
+	 * Height of an individual line of text
+	 */
+	public void setLineHeight(final String lineHeight)
+	{
+		this.lineHeight = lineHeight;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LegendOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LegendOptions.java
new file mode 100644
index 0000000..f7e5033
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LegendOptions.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.6/src/types/index.d.ts#L2360">ChartJS Source</a>
+ */
+public class LegendOptions
+{
+	protected Boolean display;
+	protected Object position;
+	protected String align;
+	protected Number maxHeight;
+	protected Number maxWidth;
+	protected Boolean fullSize;
+	protected Boolean reverse;
+	protected JavaScriptFunction onClick;
+	protected JavaScriptFunction onHover;
+	protected JavaScriptFunction onLeave;
+	protected Labels labels;
+	protected Boolean rtl;
+	protected String textDirection;
+	protected Title title;
+	
+	public Boolean getDisplay()
+	{
+		return this.display;
+	}
+	
+	public LegendOptions setDisplay(final Boolean display)
+	{
+		this.display = display;
+		return this;
+	}
+	
+	public Object getPosition()
+	{
+		return this.position;
+	}
+	
+	public LegendOptions setPosition(final Object position)
+	{
+		this.position = position;
+		return this;
+	}
+	
+	public String getAlign()
+	{
+		return this.align;
+	}
+	
+	public LegendOptions setAlign(final String align)
+	{
+		this.align = align;
+		return this;
+	}
+	
+	public Number getMaxHeight()
+	{
+		return this.maxHeight;
+	}
+	
+	public LegendOptions setMaxHeight(final Number maxHeight)
+	{
+		this.maxHeight = maxHeight;
+		return this;
+	}
+	
+	public Number getMaxWidth()
+	{
+		return this.maxWidth;
+	}
+	
+	public LegendOptions setMaxWidth(final Number maxWidth)
+	{
+		this.maxWidth = maxWidth;
+		return this;
+	}
+	
+	public Boolean getFullSize()
+	{
+		return this.fullSize;
+	}
+	
+	public LegendOptions setFullSize(final Boolean fullSize)
+	{
+		this.fullSize = fullSize;
+		return this;
+	}
+	
+	public Boolean getReverse()
+	{
+		return this.reverse;
+	}
+	
+	public LegendOptions setReverse(final Boolean reverse)
+	{
+		this.reverse = reverse;
+		return this;
+	}
+	
+	public JavaScriptFunction getOnClick()
+	{
+		return this.onClick;
+	}
+	
+	public LegendOptions setOnClick(final JavaScriptFunction onClick)
+	{
+		this.onClick = onClick;
+		return this;
+	}
+	
+	public JavaScriptFunction getOnHover()
+	{
+		return this.onHover;
+	}
+	
+	public LegendOptions setOnHover(final JavaScriptFunction onHover)
+	{
+		this.onHover = onHover;
+		return this;
+	}
+	
+	public JavaScriptFunction getOnLeave()
+	{
+		return this.onLeave;
+	}
+	
+	public LegendOptions setOnLeave(final JavaScriptFunction onLeave)
+	{
+		this.onLeave = onLeave;
+		return this;
+	}
+	
+	public Labels getLabels()
+	{
+		return this.labels;
+	}
+	
+	public LegendOptions setLabels(final Labels labels)
+	{
+		this.labels = labels;
+		return this;
+	}
+	
+	public Boolean getRtl()
+	{
+		return this.rtl;
+	}
+	
+	public LegendOptions setRtl(final Boolean rtl)
+	{
+		this.rtl = rtl;
+		return this;
+	}
+	
+	public String getTextDirection()
+	{
+		return this.textDirection;
+	}
+	
+	public LegendOptions setTextDirection(final String textDirection)
+	{
+		this.textDirection = textDirection;
+		return this;
+	}
+	
+	public Title getTitle()
+	{
+		return this.title;
+	}
+	
+	public LegendOptions setTitle(final Title title)
+	{
+		this.title = title;
+		return this;
+	}
+	
+	/**
+	 * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.6/src/types/index.d.ts#L2407">ChartJS Source</a>
+	 */
+	public static class Labels
+	{
+		protected Number boxWidth;
+		protected Number boxHeight;
+		protected Object color;
+		protected Font font;
+		protected Number padding;
+		protected Number pointStyleWidth;
+		protected JavaScriptFunction generateLabels;
+		protected JavaScriptFunction filter;
+		protected JavaScriptFunction sort;
+		protected String textAlign;
+		protected Boolean usePointStyle;
+		protected Boolean useBorderRadius;
+		protected Number borderRadius;
+		
+		public Number getBoxWidth()
+		{
+			return this.boxWidth;
+		}
+		
+		public Labels setBoxWidth(final Number boxWidth)
+		{
+			this.boxWidth = boxWidth;
+			return this;
+		}
+		
+		public Number getBoxHeight()
+		{
+			return this.boxHeight;
+		}
+		
+		public Labels setBoxHeight(final Number boxHeight)
+		{
+			this.boxHeight = boxHeight;
+			return this;
+		}
+		
+		public Object getColor()
+		{
+			return this.color;
+		}
+		
+		public Labels setColor(final Object color)
+		{
+			this.color = color;
+			return this;
+		}
+		
+		public Font getFont()
+		{
+			return this.font;
+		}
+		
+		public Labels setFont(final Font font)
+		{
+			this.font = font;
+			return this;
+		}
+		
+		public Number getPadding()
+		{
+			return this.padding;
+		}
+		
+		public Labels setPadding(final Number padding)
+		{
+			this.padding = padding;
+			return this;
+		}
+		
+		public Number getPointStyleWidth()
+		{
+			return this.pointStyleWidth;
+		}
+		
+		public Labels setPointStyleWidth(final Number pointStyleWidth)
+		{
+			this.pointStyleWidth = pointStyleWidth;
+			return this;
+		}
+		
+		public JavaScriptFunction getGenerateLabels()
+		{
+			return this.generateLabels;
+		}
+		
+		public Labels setGenerateLabels(final JavaScriptFunction generateLabels)
+		{
+			this.generateLabels = generateLabels;
+			return this;
+		}
+		
+		public JavaScriptFunction getFilter()
+		{
+			return this.filter;
+		}
+		
+		public Labels setFilter(final JavaScriptFunction filter)
+		{
+			this.filter = filter;
+			return this;
+		}
+		
+		public JavaScriptFunction getSort()
+		{
+			return this.sort;
+		}
+		
+		public Labels setSort(final JavaScriptFunction sort)
+		{
+			this.sort = sort;
+			return this;
+		}
+		
+		public String getTextAlign()
+		{
+			return this.textAlign;
+		}
+		
+		public Labels setTextAlign(final String textAlign)
+		{
+			this.textAlign = textAlign;
+			return this;
+		}
+		
+		public Boolean getUsePointStyle()
+		{
+			return this.usePointStyle;
+		}
+		
+		public Labels setUsePointStyle(final Boolean usePointStyle)
+		{
+			this.usePointStyle = usePointStyle;
+			return this;
+		}
+		
+		public Boolean getUseBorderRadius()
+		{
+			return this.useBorderRadius;
+		}
+		
+		public Labels setUseBorderRadius(final Boolean useBorderRadius)
+		{
+			this.useBorderRadius = useBorderRadius;
+			return this;
+		}
+		
+		public Number getBorderRadius()
+		{
+			return this.borderRadius;
+		}
+		
+		public Labels setBorderRadius(final Number borderRadius)
+		{
+			this.borderRadius = borderRadius;
+			return this;
+		}
+	}
+	
+	
+	/**
+	 * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.6/src/types/index.d.ts#L2490">ChartJS Source</a>
+	 */
+	public static class Title
+	{
+		protected Boolean display;
+		protected Object color;
+		protected Font font;
+		protected String position;
+		protected Object padding;
+		protected String text;
+		
+		public Boolean getDisplay()
+		{
+			return this.display;
+		}
+		
+		public Title setDisplay(final Boolean display)
+		{
+			this.display = display;
+			return this;
+		}
+		
+		public Object getColor()
+		{
+			return this.color;
+		}
+		
+		public Title setColor(final Object color)
+		{
+			this.color = color;
+			return this;
+		}
+		
+		public Font getFont()
+		{
+			return this.font;
+		}
+		
+		public Title setFont(final Font font)
+		{
+			this.font = font;
+			return this;
+		}
+		
+		public String getPosition()
+		{
+			return this.position;
+		}
+		
+		public Title setPosition(final String position)
+		{
+			this.position = position;
+			return this;
+		}
+		
+		public Object getPadding()
+		{
+			return this.padding;
+		}
+		
+		public Title setPadding(final Object padding)
+		{
+			this.padding = padding;
+			return this;
+		}
+		
+		public String getText()
+		{
+			return this.text;
+		}
+		
+		public Title setText(final String text)
+		{
+			this.text = text;
+			return this;
+		}
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java
new file mode 100644
index 0000000..4f27911
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.DefaultAnimation;
+import software.xdev.chartjs.model.options.elements.LineElements;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.5/src/types/index.d.ts#L1892">ChartJS Source</a>
+ */
+public class LineOptions extends Options<LineOptions, DefaultAnimation>
+{
+	protected Number tension;
+	protected Object stepped;
+	
+	/**
+	 * @see #setShowLine(Boolean)
+	 */
+	protected Boolean showLine;
+	/**
+	 * @see #setSpanGaps(Boolean)
+	 */
+	protected Boolean spanGaps;
+	protected LineElements elements;
+	
+	public Number getTension()
+	{
+		return this.tension;
+	}
+	
+	public LineOptions setTension(final Number tension)
+	{
+		this.tension = tension;
+		return this;
+	}
+	
+	public Object getStepped()
+	{
+		return this.stepped;
+	}
+	
+	public LineOptions setStepped(final Object stepped)
+	{
+		this.stepped = stepped;
+		return this;
+	}
+	
+	/**
+	 * @see #setShowLine(Boolean)
+	 */
+	public Boolean getShowLine()
+	{
+		return this.showLine;
+	}
+	
+	/**
+	 * <p>
+	 * If false, the lines between points are not drawn
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code true}
+	 * </p>
+	 */
+	public LineOptions setShowLine(final Boolean showLine)
+	{
+		this.showLine = showLine;
+		return this;
+	}
+	
+	/**
+	 * @see #setSpanGaps(Boolean)
+	 */
+	public Boolean getSpanGaps()
+	{
+		return this.spanGaps;
+	}
+	
+	/**
+	 * <p>
+	 * If true, NaN data does not break the line
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code false}
+	 * </p>
+	 */
+	public LineOptions setSpanGaps(final Boolean spanGaps)
+	{
+		this.spanGaps = spanGaps;
+		return this;
+	}
+	
+	/**
+	 * @return {@link LineElements} instance, or {@code null} if not set
+	 */
+	public LineElements getElements()
+	{
+		return this.elements;
+	}
+	
+	/**
+	 * @param elements an {@link LineElements} instance, or {@code null}
+	 * @return this instance for method chaining
+	 */
+	public LineOptions setElements(final LineElements elements)
+	{
+		this.elements = elements;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Options.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Options.java
new file mode 100644
index 0000000..b82f5b0
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Options.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import software.xdev.chartjs.model.enums.IndexAxis;
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+import software.xdev.chartjs.model.options.animation.Animation;
+import software.xdev.chartjs.model.options.animation.Animations;
+import software.xdev.chartjs.model.options.layout.Layout;
+import software.xdev.chartjs.model.options.scale.Scales;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.7/src/types/index.d.ts#L1588">
+ *     ChartJS Source (Options)</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.7/src/types/index.d.ts#L1756">
+ *     ChartJS Source (AnimationOptons)</a>
+ */
+public class Options<T extends Options<T, A>, A extends Animation<A>>
+{
+	protected final Set<String> events = new HashSet<>();
+	protected IndexAxis indexAxis;
+	protected Boolean responsive;
+	protected Integer responsiveAnimationDuration;
+	protected Boolean maintainAspectRatio;
+	protected JavaScriptFunction onClick;
+	protected JavaScriptFunction legendCallback;
+	protected JavaScriptFunction onResize;
+	protected CoreInteractionOptions interaction;
+	protected CoreInteractionOptions hover;
+	protected Animations<A> animations;
+	protected Object animation; // Usually a boolean or of Type <A>
+	protected Layout layout;
+	protected Plugins plugins = new Plugins();
+	
+	protected Scales scales = new Scales();
+	
+	
+	public Scales getScales()
+	{
+		return this.scales;
+	}
+	
+	public T setScales(final Scales scales)
+	{
+		this.scales = scales;
+		return this.self();
+	}
+	
+	public IndexAxis getIndexAxis()
+	{
+		return this.indexAxis;
+	}
+	
+	public T setIndexAxis(final IndexAxis indexAxis)
+	{
+		this.indexAxis = indexAxis;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setResponsive(Boolean)
+	 */
+	public Boolean getResponsive()
+	{
+		return this.responsive;
+	}
+	
+	/**
+	 * Default {@code true} Resizes when the canvas container does.
+	 */
+	public T setResponsive(final Boolean responsive)
+	{
+		this.responsive = responsive;
+		return this.self();
+	}
+	
+	public Object getAnimation()
+	{
+		return this.animation;
+	}
+	
+	public T setAnimation(final Object animation)
+	{
+		this.animation = animation;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setResponsiveAnimationDuration(Integer)
+	 */
+	public Integer getResponsiveAnimationDuration()
+	{
+		return this.responsiveAnimationDuration;
+	}
+	
+	/**
+	 * Default {@code 0} Duration in milliseconds it takes to animate to new size after a resize event.
+	 */
+	public T setResponsiveAnimationDuration(final Integer responsiveAnimationDuration)
+	{
+		this.responsiveAnimationDuration = responsiveAnimationDuration;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setMaintainAspectRatio(Boolean)
+	 */
+	public Boolean getMaintainAspectRatio()
+	{
+		return this.maintainAspectRatio;
+	}
+	
+	/**
+	 * Default {@code true} Maintain the original canvas aspect ratio (width / height) when resizing
+	 */
+	public T setMaintainAspectRatio(final Boolean maintainAspectRatio)
+	{
+		this.maintainAspectRatio = maintainAspectRatio;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setEvents(Collection)
+	 */
+	public Set<String> getEvents()
+	{
+		return this.events;
+	}
+	
+	/**
+	 * Default {@code ["mousemove", "mouseout", "click", "touchstart", "touchmove", "touchend"]} Events that the chart
+	 * should listen to for tooltips and hovering
+	 */
+	public T setEvents(final Collection<String> events)
+	{
+		this.events.clear();
+		if(events != null)
+		{
+			this.events.addAll(events);
+		}
+		return this.self();
+	}
+	
+	/**
+	 * @see #setOnClick(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getOnClick()
+	{
+		return this.onClick;
+	}
+	
+	/**
+	 * Default {@code null} Called if the event is of type 'mouseup' or 'click'. Called in the context of the chart and
+	 * passed an array of active arcElements
+	 */
+	public T setOnClick(final JavaScriptFunction onClick)
+	{
+		this.onClick = onClick;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setLegendCallback(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getLegendCallback()
+	{
+		return this.legendCallback;
+	}
+	
+	/**
+	 * Default {@code function (chart) { }} Function to generate a legend. Receives the chart object to generate a
+	 * legend from. Default implementation returns an HTML string.
+	 */
+	public T setLegendCallback(final JavaScriptFunction legendCallback)
+	{
+		this.legendCallback = legendCallback;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setOnResize(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getOnResize()
+	{
+		return this.onResize;
+	}
+	
+	/**
+	 * Default {@code null} Called when a resize occurs. Gets passed two arguemnts: the chart instance and the new
+	 * size.
+	 */
+	public T setOnResize(final JavaScriptFunction onResize)
+	{
+		this.onResize = onResize;
+		return this.self();
+	}
+	
+	public CoreInteractionOptions getInteraction()
+	{
+		return this.interaction;
+	}
+	
+	public T setInteraction(final CoreInteractionOptions interaction)
+	{
+		this.interaction = interaction;
+		return this.self();
+	}
+	
+	public CoreInteractionOptions getHover()
+	{
+		return this.hover;
+	}
+	
+	/**
+	 * The hover configuration is passed into the options.hover namespace. The global hover configuration is at
+	 * Chart.defaults.global.hover.
+	 */
+	public T setHover(final CoreInteractionOptions hover)
+	{
+		this.hover = hover;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setAnimations(Animations)
+	 */
+	public Animations<A> getAnimations()
+	{
+		return this.animations;
+	}
+	
+	/**
+	 * The following animation options are available. The global options for are defined in
+	 * Chart.defaults.global.animation.
+	 */
+	public T setAnimations(final Animations<A> animations)
+	{
+		this.animations = animations;
+		return this.self();
+	}
+	
+	/**
+	 * @return {@link Layout} instance or {@code null}
+	 */
+	public Layout getLayout()
+	{
+		return this.layout;
+	}
+	
+	/**
+	 * @param layout {@link Layout} instance or {@code null}
+	 * @return {@code this} instance for chaining
+	 */
+	public T setLayout(final Layout layout)
+	{
+		this.layout = layout;
+		return this.self();
+	}
+	
+	/**
+	 * @see #setPlugins(Plugins)
+	 */
+	public Plugins getPlugins()
+	{
+		return this.plugins;
+	}
+	
+	/**
+	 * A placeholder in which configuration options for plugins may be passed.
+	 *
+	 * @param plugins {@link Object} or {@code null}
+	 * @return {@code this} instance for chaining
+	 */
+	public T setPlugins(final Plugins plugins)
+	{
+		this.plugins = plugins;
+		return this.self();
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected T self()
+	{
+		return (T)this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/PieOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/PieOptions.java
new file mode 100644
index 0000000..020d7bd
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/PieOptions.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.PieAnimation;
+
+
+public class PieOptions extends DoughnutOptionsBase<PieOptions, PieAnimation>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Plugins.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Plugins.java
new file mode 100644
index 0000000..021421b
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Plugins.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.plugins.zoom.Zoom;
+
+
+public class Plugins
+{
+	protected Title title;
+	protected Title subtitle;
+	protected LegendOptions legend;
+	protected Tooltip tooltip;
+	protected Zoom zoom;
+	
+	/**
+	 * @see #setTitle(Title)
+	 */
+	public Title getTitle()
+	{
+		return this.title;
+	}
+	
+	/**
+	 * The title configuration is passed into the options.title namespace. The global options for the chart title is
+	 * defined in Chart.defaults.global.title.
+	 */
+	public Plugins setTitle(final Title title)
+	{
+		this.title = title;
+		return this;
+	}
+	
+	/**
+	 * @see #setSubtitle(Title)
+	 */
+	public Title getSubtitle()
+	{
+		return this.subtitle;
+	}
+	
+	/**
+	 * The subtitle configuration is passed into the options.subtitle namespace. The global options for the chart
+	 * subtitle is defined in Chart.defaults.global.subtitle.
+	 */
+	public Plugins setSubtitle(final Title subtitle)
+	{
+		this.subtitle = subtitle;
+		return this;
+	}
+	
+	/**
+	 * @see #setLegend(LegendOptions)
+	 */
+	public LegendOptions getLegend()
+	{
+		return this.legend;
+	}
+	
+	/**
+	 * The legend configuration is passed into the options.legend namespace. The global options for the chart legend is
+	 * defined in Chart.defaults.global.legend.
+	 */
+	public Plugins setLegend(final LegendOptions legend)
+	{
+		this.legend = legend;
+		return this;
+	}
+	
+	/**
+	 * @see #setTooltip(Tooltip)
+	 */
+	public Tooltip getTooltip()
+	{
+		return this.tooltip;
+	}
+	
+	/**
+	 * The tooltip label configuration is nested below the tooltip configuration using the callbacks key. The tooltip
+	 * has the following callbacks for providing text. For all functions, 'this' will be the tooltip object created
+	 * from
+	 * the Chart.Tooltip constructor.
+	 * <p>
+	 * All functions are called with the same arguments: a tooltip item and the data object passed to the chart. All
+	 * functions must return either a string or an array of strings. Arrays of strings are treated as multiple lines of
+	 * text.
+	 */
+	public Plugins setTooltip(final Tooltip tooltip)
+	{
+		this.tooltip = tooltip;
+		return this;
+	}
+	
+	/**
+	 * @see #setZoom(Zoom)
+	 */
+	public Zoom getZoom()
+	{
+		return this.zoom;
+	}
+	
+	/**
+	 * A zoom and pan plugin for Chart.js. Panning can be done via the mouse or with a finger. Zooming is done via the
+	 * mouse wheel or via a pinch gesture.
+	 * <p>
+	 * Note: Requires the {@link Zoom} plugin installed.
+	 * </p>
+	 */
+	public Plugins setZoom(final Zoom zoom)
+	{
+		this.zoom = zoom;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/PolarOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/PolarOptions.java
new file mode 100644
index 0000000..8b81b57
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/PolarOptions.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.PolarAnimation;
+import software.xdev.chartjs.model.options.elements.ArcElements;
+import software.xdev.chartjs.model.options.scale.radial.RadialLinearScaleOptions;
+
+
+public class PolarOptions extends Options<PolarOptions, PolarAnimation>
+{
+	/**
+	 * @see #setScale(RadialLinearScaleOptions scale)
+	 */
+	protected RadialLinearScaleOptions scale;
+	
+	protected ArcElements elements;
+	
+	/**
+	 * Static factory, constructs a Scale implementation appropriate for a {@link PolarOptions} instance.
+	 *
+	 * @return a new {@link RadialLinearScaleOptions} instance
+	 */
+	public static RadialLinearScaleOptions scales()
+	{
+		return new RadialLinearScaleOptions();
+	}
+	
+	/**
+	 * @see #setScale(RadialLinearScaleOptions)
+	 */
+	public RadialLinearScaleOptions getScale()
+	{
+		return this.scale;
+	}
+	
+	/**
+	 * Options for the one scale used on the chart. Use this to style the ticks, labels, and grid.
+	 */
+	public PolarOptions setScale(final RadialLinearScaleOptions scale)
+	{
+		this.scale = scale;
+		return this;
+	}
+	
+	/**
+	 * @return {@link ArcElements} instance, or {@code null} if not set
+	 */
+	public ArcElements getElements()
+	{
+		return this.elements;
+	}
+	
+	/**
+	 * @param elements an {@link ArcElements} instance, or {@code null}
+	 * @return this instance for method chaining
+	 */
+	public PolarOptions setElements(final ArcElements elements)
+	{
+		this.elements = elements;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/RadarOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/RadarOptions.java
new file mode 100644
index 0000000..076268c
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/RadarOptions.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.options.animation.DefaultAnimation;
+import software.xdev.chartjs.model.options.elements.RadarElements;
+
+
+public class RadarOptions extends Options<RadarOptions, DefaultAnimation>
+{
+	protected RadarElements elements;
+	
+	/**
+	 * @see #setElements(RadarElements)
+	 */
+	public RadarElements getElements()
+	{
+		return this.elements;
+	}
+	
+	/**
+	 * Options for all line elements used on the chart, as defined in the global elements, duplicated here to show
+	 * Radar
+	 * chart specific defaults.
+	 */
+	public RadarOptions setElements(final RadarElements elements)
+	{
+		this.elements = elements;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Title.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Title.java
new file mode 100644
index 0000000..feb4c80
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Title.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/labelling.html#scale-title-configuration">ChartJS docs</a>
+ */
+public class Title
+{
+	protected String align;
+	protected Object color;
+	protected Boolean display;
+	protected Boolean fullSize;
+	protected String position;
+	protected Font font;
+	protected Integer padding;
+	protected String text;
+	
+	/**
+	 * @see #setAlign(String)
+	 */
+	public String getAlign()
+	{
+		return this.align;
+	}
+	
+	/**
+	 * Alignment of the title
+	 *
+	 * <p>Default: center</p>
+	 */
+	public Title setAlign(final String align)
+	{
+		this.align = align;
+		return this;
+	}
+	
+	/**
+	 * @see #setColor(Object)
+	 */
+	public Object getColor()
+	{
+		return this.color;
+	}
+	
+	/**
+	 * Color of text
+	 */
+	public Title setColor(final Object color)
+	{
+		this.color = color;
+		return this;
+	}
+	
+	/**
+	 * @see #setFullSize(Boolean)
+	 */
+	public Boolean getFullSize()
+	{
+		return this.fullSize;
+	}
+	
+	/**
+	 * Marks that this box should take the full width/height of the canvas. If false, the box is sized and placed
+	 * above/beside the chart area.
+	 *
+	 * <p>Default: true</p>
+	 */
+	public Title setFullSize(final Boolean fullSize)
+	{
+		this.fullSize = fullSize;
+		return this;
+	}
+	
+	public Font getFont()
+	{
+		return this.font;
+	}
+	
+	public Title setFont(final Font font)
+	{
+		this.font = font;
+		return this;
+	}
+	
+	/**
+	 * @see #setDisplay(Boolean)
+	 */
+	public Boolean getDisplay()
+	{
+		return this.display;
+	}
+	
+	/**
+	 * <p>
+	 * Display the title block
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code false}
+	 * </p>
+	 */
+	public Title setDisplay(final Boolean display)
+	{
+		this.display = display;
+		return this;
+	}
+	
+	/**
+	 * @see #setPosition(String)
+	 */
+	public String getPosition()
+	{
+		return this.position;
+	}
+	
+	/**
+	 * <p>
+	 * Position of the title. Only 'top' or 'bottom' are currently allowed
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'top'}
+	 * </p>
+	 */
+	public Title setPosition(final String position)
+	{
+		this.position = position;
+		return this;
+	}
+	
+	/**
+	 * @see #setPadding(Integer)
+	 */
+	public Integer getPadding()
+	{
+		return this.padding;
+	}
+	
+	/**
+	 * <p>
+	 * Number of pixels to add above and below the title text
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 10}
+	 * </p>
+	 */
+	public Title setPadding(final Integer padding)
+	{
+		this.padding = padding;
+		return this;
+	}
+	
+	/**
+	 * @see #setText(String)
+	 */
+	public String getText()
+	{
+		return this.text;
+	}
+	
+	/**
+	 * <p>
+	 * Title text
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code ""}
+	 * </p>
+	 */
+	public Title setText(final String text)
+	{
+		this.text = text;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Tooltip.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Tooltip.java
new file mode 100644
index 0000000..53cc89d
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Tooltip.java
@@ -0,0 +1,700 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options;
+
+import software.xdev.chartjs.model.enums.FontStyle;
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+
+
+public class Tooltip
+{
+	protected Boolean enabled;
+	protected JavaScriptFunction external;
+	protected String mode;
+	protected JavaScriptFunction itemSort;
+	protected Object backgroundColor;
+	protected String titleFontFamily;
+	protected Integer titleFontSize;
+	protected FontStyle titleFontStyle;
+	protected Object titleFontColor;
+	protected Integer titleSpacing;
+	protected Integer titleMarginBottom;
+	protected String bodyFontFamily;
+	protected Integer bodyFontSize;
+	protected FontStyle bodyFontStyle;
+	protected Object bodyFontColor;
+	protected Integer bodySpacing;
+	protected String footerFontFamily;
+	protected Integer footerFontSize;
+	protected FontStyle footerFontStyle;
+	protected Object footerFontColor;
+	protected Integer footerSpacing;
+	protected Integer footerMarginTop;
+	protected Integer xPadding;
+	protected Integer yPadding;
+	protected Integer caretSize;
+	protected Integer cornerRadius;
+	protected Object multiKeyBackground;
+	protected Callbacks callbacks;
+	
+	/**
+	 * @see #setEnabled(Boolean)
+	 */
+	public Boolean getEnabled()
+	{
+		return this.enabled;
+	}
+	
+	/**
+	 * <p>
+	 * Are tooltips enabled
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code true}
+	 * </p>
+	 */
+	public Tooltip setEnabled(final Boolean enabled)
+	{
+		this.enabled = enabled;
+		return this;
+	}
+	
+	/**
+	 * @see #setExternal(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getExternal()
+	{
+		return this.external;
+	}
+	
+	/**
+	 * <p>
+	 * See section below
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code null}
+	 * </p>
+	 */
+	public Tooltip setExternal(final JavaScriptFunction external)
+	{
+		this.external = external;
+		return this;
+	}
+	
+	/**
+	 * @see #setMode(String)
+	 */
+	public String getMode()
+	{
+		return this.mode;
+	}
+	
+	/**
+	 * <p>
+	 * Sets which elements appear in the tooltip. Acceptable options are 'single', 'label' or 'x-axis'.  single
+	 * highlights the closest element.  label highlights elements in all datasets at the same X value.  'x-axis' also
+	 * highlights elements in all datasets at the same X value, but activates when hovering anywhere within the
+	 * vertical
+	 * slice of the x-axis representing that X value.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'single'}
+	 * </p>
+	 */
+	public Tooltip setMode(final String mode)
+	{
+		this.mode = mode;
+		return this;
+	}
+	
+	/**
+	 * @see #setItemSort(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getItemSort()
+	{
+		return this.itemSort;
+	}
+	
+	/**
+	 * <p>
+	 * Allows sorting of tooltip items. Must implement a function that can be passed to Array.prototype.sort
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code undefined}
+	 * </p>
+	 */
+	public Tooltip setItemSort(final JavaScriptFunction itemSort)
+	{
+		this.itemSort = itemSort;
+		return this;
+	}
+	
+	/**
+	 * @see #setBackgroundColor(Object)
+	 */
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	/**
+	 * <p>
+	 * Background color of the tooltip
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.8)'}
+	 * </p>
+	 */
+	public Tooltip setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitleFontFamily(String)
+	 */
+	public String getTitleFontFamily()
+	{
+		return this.titleFontFamily;
+	}
+	
+	/**
+	 * <p>
+	 * Font family for tooltip title inherited from global font family
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"}
+	 * </p>
+	 */
+	public Tooltip setTitleFontFamily(final String titleFontFamily)
+	{
+		this.titleFontFamily = titleFontFamily;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitleFontSize(Integer)
+	 */
+	public Integer getTitleFontSize()
+	{
+		return this.titleFontSize;
+	}
+	
+	/**
+	 * <p>
+	 * Font size for tooltip title inherited from global font size
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 12}
+	 * </p>
+	 */
+	public Tooltip setTitleFontSize(final Integer titleFontSize)
+	{
+		this.titleFontSize = titleFontSize;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitleFontStyle(FontStyle)
+	 */
+	public FontStyle getTitleFontStyle()
+	{
+		return this.titleFontStyle;
+	}
+	
+	/**
+	 * <p>
+	 *
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "bold"}
+	 * </p>
+	 */
+	public Tooltip setTitleFontStyle(final FontStyle titleFontStyle)
+	{
+		this.titleFontStyle = titleFontStyle;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitleFontColor(Object)
+	 */
+	public Object getTitleFontColor()
+	{
+		return this.titleFontColor;
+	}
+	
+	/**
+	 * <p>
+	 * Font color for tooltip title
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "#fff"}
+	 * </p>
+	 */
+	public Tooltip setTitleFontColor(final Object titleFontColor)
+	{
+		this.titleFontColor = titleFontColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitleSpacing(Integer)
+	 */
+	public Integer getTitleSpacing()
+	{
+		return this.titleSpacing;
+	}
+	
+	/**
+	 * <p>
+	 * Spacing to add to top and bottom of each title line.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 2}
+	 * </p>
+	 */
+	public Tooltip setTitleSpacing(final Integer titleSpacing)
+	{
+		this.titleSpacing = titleSpacing;
+		return this;
+	}
+	
+	/**
+	 * @see #setTitleMarginBottom(Integer)
+	 */
+	public Integer getTitleMarginBottom()
+	{
+		return this.titleMarginBottom;
+	}
+	
+	/**
+	 * <p>
+	 * Margin to add on bottom of title section
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 6}
+	 * </p>
+	 */
+	public Tooltip setTitleMarginBottom(final Integer titleMarginBottom)
+	{
+		this.titleMarginBottom = titleMarginBottom;
+		return this;
+	}
+	
+	/**
+	 * @see #setBodyFontFamily(String)
+	 */
+	public String getBodyFontFamily()
+	{
+		return this.bodyFontFamily;
+	}
+	
+	/**
+	 * <p>
+	 * Font family for tooltip items inherited from global font family
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"}
+	 * </p>
+	 */
+	public Tooltip setBodyFontFamily(final String bodyFontFamily)
+	{
+		this.bodyFontFamily = bodyFontFamily;
+		return this;
+	}
+	
+	/**
+	 * @see #setBodyFontSize(Integer)
+	 */
+	public Integer getBodyFontSize()
+	{
+		return this.bodyFontSize;
+	}
+	
+	/**
+	 * <p>
+	 * Font size for tooltip items inherited from global font size
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 12}
+	 * </p>
+	 */
+	public Tooltip setBodyFontSize(final Integer bodyFontSize)
+	{
+		this.bodyFontSize = bodyFontSize;
+		return this;
+	}
+	
+	/**
+	 * @see #setBodyFontStyle(FontStyle)
+	 */
+	public FontStyle getBodyFontStyle()
+	{
+		return this.bodyFontStyle;
+	}
+	
+	/**
+	 * <p>
+	 *
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "normal"}
+	 * </p>
+	 */
+	public Tooltip setBodyFontStyle(final FontStyle bodyFontStyle)
+	{
+		this.bodyFontStyle = bodyFontStyle;
+		return this;
+	}
+	
+	/**
+	 * @see #setBodyFontColor(Object)
+	 */
+	public Object getBodyFontColor()
+	{
+		return this.bodyFontColor;
+	}
+	
+	/**
+	 * <p>
+	 * Font color for tooltip items.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "#fff"}
+	 * </p>
+	 */
+	public Tooltip setBodyFontColor(final Object bodyFontColor)
+	{
+		this.bodyFontColor = bodyFontColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBodySpacing(Integer)
+	 */
+	public Integer getBodySpacing()
+	{
+		return this.bodySpacing;
+	}
+	
+	/**
+	 * <p>
+	 * Spacing to add to top and bottom of each tooltip item
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 2}
+	 * </p>
+	 */
+	public Tooltip setBodySpacing(final Integer bodySpacing)
+	{
+		this.bodySpacing = bodySpacing;
+		return this;
+	}
+	
+	/**
+	 * @see #setFooterFontFamily(String)
+	 */
+	public String getFooterFontFamily()
+	{
+		return this.footerFontFamily;
+	}
+	
+	/**
+	 * <p>
+	 * Font family for tooltip footer inherited from global font family.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"}
+	 * </p>
+	 */
+	public Tooltip setFooterFontFamily(final String footerFontFamily)
+	{
+		this.footerFontFamily = footerFontFamily;
+		return this;
+	}
+	
+	/**
+	 * @see #setFooterFontSize(Integer)
+	 */
+	public Integer getFooterFontSize()
+	{
+		return this.footerFontSize;
+	}
+	
+	/**
+	 * <p>
+	 * Font size for tooltip footer inherited from global font size.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 12}
+	 * </p>
+	 */
+	public Tooltip setFooterFontSize(final Integer footerFontSize)
+	{
+		this.footerFontSize = footerFontSize;
+		return this;
+	}
+	
+	/**
+	 * @see #setFooterFontStyle(FontStyle)
+	 */
+	public FontStyle getFooterFontStyle()
+	{
+		return this.footerFontStyle;
+	}
+	
+	/**
+	 * <p>
+	 * Font style for tooltip footer.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "bold"}
+	 * </p>
+	 */
+	public Tooltip setFooterFontStyle(final FontStyle footerFontStyle)
+	{
+		this.footerFontStyle = footerFontStyle;
+		return this;
+	}
+	
+	/**
+	 * @see #setFooterFontColor(Object)
+	 */
+	public Object getFooterFontColor()
+	{
+		return this.footerFontColor;
+	}
+	
+	/**
+	 * <p>
+	 * Font color for tooltip footer.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "#fff"}
+	 * </p>
+	 */
+	public Tooltip setFooterFontColor(final Object footerFontColor)
+	{
+		this.footerFontColor = footerFontColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setFooterSpacing(Integer)
+	 */
+	public Integer getFooterSpacing()
+	{
+		return this.footerSpacing;
+	}
+	
+	/**
+	 * <p>
+	 * Spacing to add to top and bottom of each footer line.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 2}
+	 * </p>
+	 */
+	public Tooltip setFooterSpacing(final Integer footerSpacing)
+	{
+		this.footerSpacing = footerSpacing;
+		return this;
+	}
+	
+	/**
+	 * @see #setFooterMarginTop(Integer)
+	 */
+	public Integer getFooterMarginTop()
+	{
+		return this.footerMarginTop;
+	}
+	
+	/**
+	 * <p>
+	 * Margin to add before drawing the footer
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 6}
+	 * </p>
+	 */
+	public Tooltip setFooterMarginTop(final Integer footerMarginTop)
+	{
+		this.footerMarginTop = footerMarginTop;
+		return this;
+	}
+	
+	/**
+	 * @see #setXPadding(Integer)
+	 */
+	public Integer getXPadding()
+	{
+		return this.xPadding;
+	}
+	
+	/**
+	 * <p>
+	 * Padding to add on left and right of tooltip
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 6}
+	 * </p>
+	 */
+	public Tooltip setXPadding(final Integer xPadding)
+	{
+		this.xPadding = xPadding;
+		return this;
+	}
+	
+	/**
+	 * @see #setYPadding(Integer)
+	 */
+	public Integer getYPadding()
+	{
+		return this.yPadding;
+	}
+	
+	/**
+	 * <p>
+	 * Padding to add on top and bottom of tooltip
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 6}
+	 * </p>
+	 */
+	public Tooltip setYPadding(final Integer yPadding)
+	{
+		this.yPadding = yPadding;
+		return this;
+	}
+	
+	/**
+	 * @see #setCaretSize(Integer)
+	 */
+	public Integer getCaretSize()
+	{
+		return this.caretSize;
+	}
+	
+	/**
+	 * <p>
+	 * Size, in px, of the tooltip arrow
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 5}
+	 * </p>
+	 */
+	public Tooltip setCaretSize(final Integer caretSize)
+	{
+		this.caretSize = caretSize;
+		return this;
+	}
+	
+	/**
+	 * @see #setCornerRadius(Integer)
+	 */
+	public Integer getCornerRadius()
+	{
+		return this.cornerRadius;
+	}
+	
+	/**
+	 * <p>
+	 * Radius of tooltip corner curves
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 6}
+	 * </p>
+	 */
+	public Tooltip setCornerRadius(final Integer cornerRadius)
+	{
+		this.cornerRadius = cornerRadius;
+		return this;
+	}
+	
+	/**
+	 * @see #setMultiKeyBackground(Object)
+	 */
+	public Object getMultiKeyBackground()
+	{
+		return this.multiKeyBackground;
+	}
+	
+	/**
+	 * <p>
+	 * Color to draw behind the colored boxes when multiple items are in the tooltip
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code "#fff"}
+	 * </p>
+	 */
+	public Tooltip setMultiKeyBackground(final Object multiKeyBackground)
+	{
+		this.multiKeyBackground = multiKeyBackground;
+		return this;
+	}
+	
+	/**
+	 * @see #setCallbacks(Callbacks)
+	 */
+	public Callbacks getCallbacks()
+	{
+		return this.callbacks;
+	}
+	
+	/**
+	 * <p>
+	 * See the callbacks section below
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code }
+	 * </p>
+	 */
+	public Tooltip setCallbacks(final Callbacks callbacks)
+	{
+		this.callbacks = callbacks;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Active.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Active.java
new file mode 100644
index 0000000..ac3c672
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Active.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+public class Active
+{
+	protected Integer duration;
+	
+	public Integer getDuration()
+	{
+		return this.duration;
+	}
+	
+	public Active setDuration(final Integer duration)
+	{
+		this.duration = duration;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Animation.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Animation.java
new file mode 100644
index 0000000..4f47473
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Animation.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+import software.xdev.chartjs.model.enums.Easing;
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+
+
+public class Animation<T extends Animation<?>>
+{
+	protected Integer duration;
+	
+	protected Easing easing;
+	
+	protected Active active;
+	
+	protected Resize resize;
+	
+	/**
+	 * @see #setOnProgress(JavaScriptFunction onProgress)
+	 */
+	protected JavaScriptFunction onProgress;
+	
+	/**
+	 * @see #setOnComplete(JavaScriptFunction onComplete)
+	 */
+	protected JavaScriptFunction onComplete;
+	
+	/**
+	 * @return duration as {@link Integer} or {@code null}
+	 * @see #setDuration(Integer)
+	 */
+	public Integer getDuration()
+	{
+		return this.duration;
+	}
+	
+	/**
+	 * <p>
+	 * Default {@code 1000}
+	 * </p>
+	 *
+	 * <p>
+	 * The number of milliseconds an animation takes.
+	 * </p>
+	 */
+	public T setDuration(final Integer duration)
+	{
+		this.duration = duration;
+		return this.self();
+	}
+	
+	/**
+	 * @return {@link Easing} or {@code null}
+	 * @see #setEasing(Easing)
+	 */
+	public Easing getEasing()
+	{
+		return this.easing;
+	}
+	
+	/**
+	 * <p>
+	 * Default {@link Easing#EASE_OUT_QUART}
+	 * </p>
+	 *
+	 * <p>
+	 * Easing function to use.
+	 * </p>
+	 *
+	 * <p>
+	 * Easing functions adapted from Robert Penner's easing equations http://www.robertpenner.com/easing/
+	 * </p>
+	 */
+	public T setEasing(final Easing easing)
+	{
+		this.easing = easing;
+		return this.self();
+	}
+	
+	public Active getActive()
+	{
+		return this.active;
+	}
+	
+	public T setActive(final Active active)
+	{
+		this.active = active;
+		return this.self();
+	}
+	
+	public Resize getResize()
+	{
+		return this.resize;
+	}
+	
+	public void setResize(final Resize resize)
+	{
+		this.resize = resize;
+	}
+	
+	/**
+	 * @return {@link JavaScriptFunction} or {@code null}
+	 * @see #setOnProgress(JavaScriptFunction onProgress)
+	 */
+	public JavaScriptFunction getOnProgress()
+	{
+		return this.onProgress;
+	}
+	
+	/**
+	 * <p>
+	 * Default {@code none}
+	 * </p>
+	 *
+	 * <p>
+	 * Callback called on each step of an animation. Passed a single argument, an object, containing the chart instance
+	 * and an object with details of the animation.
+	 * </p>
+	 */
+	public T setOnProgress(final JavaScriptFunction onProgress)
+	{
+		this.onProgress = onProgress;
+		return this.self();
+	}
+	
+	/**
+	 * @return {@link JavaScriptFunction} or {@code null}
+	 * @see #setOnComplete(JavaScriptFunction)
+	 */
+	public JavaScriptFunction getOnComplete()
+	{
+		return this.onComplete;
+	}
+	
+	/**
+	 * <p>
+	 * Default {@code none}
+	 * </p>
+	 *
+	 * <p>
+	 * Callback called at the end of an animation. Passed the same arguments as onProgress
+	 * </p>
+	 */
+	public T setOnComplete(final JavaScriptFunction onComplete)
+	{
+		this.onComplete = onComplete;
+		return this.self();
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected T self()
+	{
+		return (T)this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/AnimationType.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/AnimationType.java
new file mode 100644
index 0000000..9abbe25
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/AnimationType.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import software.xdev.chartjs.model.EnumNameToCamelCase;
+
+
+public enum AnimationType
+{
+	X,
+	Y,
+	BORDER_WIDTH,
+	RADIUS,
+	TENSION;
+	
+	@JsonValue
+	@Override
+	public String toString()
+	{
+		return EnumNameToCamelCase.getName(this);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Animations.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Animations.java
new file mode 100644
index 0000000..c95bf2b
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Animations.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+
+
+public class Animations<T extends Animation<T>>
+{
+	protected Map<String, Object> animationTypes = new LinkedHashMap<>();
+	
+	public Animations(final AnimationType type, final Animation<T> animation)
+	{
+		this.animationTypes.put(type.toString(), animation);
+	}
+	
+	@JsonAnyGetter
+	public Map<String, Object> getAnimationTypes()
+	{
+		return this.animationTypes;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DefaultAnimation.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DefaultAnimation.java
new file mode 100644
index 0000000..7830778
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DefaultAnimation.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+public class DefaultAnimation extends Animation<DefaultAnimation>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DoughnutAnimation.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DoughnutAnimation.java
new file mode 100644
index 0000000..d90bf7a
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DoughnutAnimation.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+public class DoughnutAnimation extends DoughnutAnimationBase<DoughnutAnimation>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DoughnutAnimationBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DoughnutAnimationBase.java
new file mode 100644
index 0000000..479c202
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/DoughnutAnimationBase.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.6/src/types/index.d.ts#L284">ChartJS Source</a>
+ */
+public abstract class DoughnutAnimationBase<T extends DoughnutAnimationBase<T>> extends Animation<T>
+{
+	protected Boolean animateRotate;
+	protected Boolean animateScale;
+	
+	public Boolean getAnimateRotate()
+	{
+		return this.animateRotate;
+	}
+	
+	public DoughnutAnimationBase<T> setAnimateRotate(final Boolean animateRotate)
+	{
+		this.animateRotate = animateRotate;
+		return this.self();
+	}
+	
+	public Boolean getAnimateScale()
+	{
+		return this.animateScale;
+	}
+	
+	public DoughnutAnimationBase<T> setAnimateScale(final Boolean animateScale)
+	{
+		this.animateScale = animateScale;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/PieAnimation.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/PieAnimation.java
new file mode 100644
index 0000000..4285b7a
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/PieAnimation.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+public class PieAnimation extends DoughnutAnimationBase<PieAnimation>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/PolarAnimation.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/PolarAnimation.java
new file mode 100644
index 0000000..3463d80
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/PolarAnimation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+public class PolarAnimation extends Animation<PolarAnimation>
+{
+	
+	/**
+	 * Default {@code true}
+	 *
+	 * @see #setAnimateRotate(Boolean)
+	 */
+	protected Boolean animateRotate;
+	
+	/**
+	 * Default {@code true}
+	 *
+	 * @see #setAnimateScale(Boolean)
+	 */
+	protected Boolean animateScale;
+	
+	/**
+	 * @see #setAnimateRotate(Boolean)
+	 */
+	public Boolean getAnimateRotate()
+	{
+		return this.animateRotate;
+	}
+	
+	/**
+	 * If true, will animate the rotation of the chart.
+	 */
+	public PolarAnimation setAnimateRotate(final Boolean animateRotate)
+	{
+		this.animateRotate = animateRotate;
+		return this;
+	}
+	
+	/**
+	 * @see #setAnimateScale(Boolean)
+	 */
+	public Boolean getAnimateScale()
+	{
+		return this.animateScale;
+	}
+	
+	/**
+	 * If true, will animate scaling the chart.
+	 */
+	public PolarAnimation setAnimateScale(final Boolean animateScale)
+	{
+		this.animateScale = animateScale;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Resize.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Resize.java
new file mode 100644
index 0000000..c20cef1
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/animation/Resize.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.animation;
+
+public class Resize
+{
+	protected Integer duration;
+	
+	public Integer getDuration()
+	{
+		return this.duration;
+	}
+	
+	public Resize setDuration(final Integer duration)
+	{
+		this.duration = duration;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Arc.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Arc.java
new file mode 100644
index 0000000..47c7c82
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Arc.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+/**
+ * <p>
+ * Arcs are used in the polar area, doughnut and pie charts.
+ * </p>
+ * <p>
+ * When set, these options apply to all objects of that type unless specifically overridden by the configuration
+ * attached to a dataset.
+ * </p>
+ */
+public class Arc
+{
+	protected Object backgroundColor;
+	
+	protected Object borderColor;
+	
+	protected Integer borderWidth;
+	
+	/**
+	 * @see #setBackgroundColor(Object)
+	 */
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default fill color for arcs. Inherited from the global default
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.1)'}
+	 * </p>
+	 */
+	public Arc setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderColor(Object)
+	 */
+	public Object getBorderColor()
+	{
+		return this.borderColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default stroke color for arcs
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code '#fff'}
+	 * </p>
+	 */
+	public Arc setBorderColor(final Object borderColor)
+	{
+		this.borderColor = borderColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderWidth(Integer)
+	 */
+	public Integer getBorderWidth()
+	{
+		return this.borderWidth;
+	}
+	
+	/**
+	 * <p>
+	 * Default stroke width for arcs
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 2}
+	 * </p>
+	 */
+	public Arc setBorderWidth(final Integer borderWidth)
+	{
+		this.borderWidth = borderWidth;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/ArcElements.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/ArcElements.java
new file mode 100644
index 0000000..b480216
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/ArcElements.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+/**
+ * Arcs are used in the polar area, doughnut and pie charts.
+ */
+public class ArcElements
+{
+	
+	protected Arc arc;
+	
+	/**
+	 * No-arg constructor
+	 */
+	public ArcElements()
+	{
+		
+	}
+	
+	/**
+	 * Constructor
+	 *
+	 * @param arc {@link Arc} instance or {@code null}
+	 */
+	public ArcElements(final Arc arc)
+	{
+		this.arc = arc;
+	}
+	
+	/**
+	 * @return {@link Arc} instance or {@code null} if not set
+	 * @see #setArc(Arc)
+	 */
+	public Arc getArc()
+	{
+		return this.arc;
+	}
+	
+	/**
+	 * @param arc {@link Arc} instance or {@code null}
+	 * @return this {@link ArcElements} instance for chaining
+	 */
+	public ArcElements setArc(final Arc arc)
+	{
+		this.arc = arc;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Bar.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Bar.java
new file mode 100644
index 0000000..85342ba
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Bar.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+import software.xdev.chartjs.model.enums.BorderSkipped;
+
+
+/**
+ * <p>
+ * Bar elements are used to represent the bars in a bar chart.
+ * </p>
+ * <p>
+ * When set, these options apply to all objects of that type unless specifically overridden by the configuration
+ * attached to a dataset.
+ * </p>
+ */
+public class Bar
+{
+	
+	/**
+	 * @see #setBackgroundColor(Object)
+	 */
+	protected Object backgroundColor;
+	
+	/**
+	 * @see #setBorderWidth(Integer)
+	 */
+	protected Integer borderWidth;
+	
+	/**
+	 * @see #setBorderColor(Object)
+	 */
+	protected Object borderColor;
+	
+	/**
+	 * @see #setBorderSkipped(BorderSkipped)
+	 */
+	protected BorderSkipped borderSkipped;
+	
+	/**
+	 * @see #setBackgroundColor(Object)
+	 */
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default bar fill color
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.1)'}
+	 * </p>
+	 */
+	public Bar setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderWidth(Integer)
+	 */
+	public Integer getBorderWidth()
+	{
+		return this.borderWidth;
+	}
+	
+	/**
+	 * <p>
+	 * Default bar stroke width
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 0}
+	 * </p>
+	 */
+	public Bar setBorderWidth(final Integer borderWidth)
+	{
+		this.borderWidth = borderWidth;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderColor(Object)
+	 */
+	public Object getBorderColor()
+	{
+		return this.borderColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default bar stroke color
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.1)'}
+	 * </p>
+	 */
+	public Bar setBorderColor(final Object borderColor)
+	{
+		this.borderColor = borderColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderSkipped(BorderSkipped)
+	 */
+	public BorderSkipped getBorderSkipped()
+	{
+		return this.borderSkipped;
+	}
+	
+	/**
+	 * <p>
+	 * Default skipped (excluded) border for rectangle. Can be one of bottom, left, top, right
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'bottom'}
+	 * </p>
+	 */
+	public Bar setBorderSkipped(final BorderSkipped borderSkipped)
+	{
+		this.borderSkipped = borderSkipped;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/BarElements.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/BarElements.java
new file mode 100644
index 0000000..e94e5bc
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/BarElements.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+/**
+ * Bar elements are used to represent the bars in a bar chart.
+ */
+public class BarElements
+{
+	protected Bar bars;
+	
+	public BarElements()
+	{
+		
+	}
+	
+	/**
+	 * @param bar {@link Bar} instance or {@code null}
+	 */
+	public BarElements(final Bar bar)
+	{
+		this.bars = bar;
+	}
+	
+	/**
+	 * @return {@link Bar} instance or {@code null} if not set
+	 * @see #setBars(Bar)
+	 */
+	public Bar getBars()
+	{
+		return this.bars;
+	}
+	
+	/**
+	 * @param bars {@link Bar} instance or {@code null}
+	 * @return this {@link BarElements} instance for chaining
+	 */
+	public BarElements setBars(final Bar bars)
+	{
+		this.bars = bars;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/BubbleElements.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/BubbleElements.java
new file mode 100644
index 0000000..703d135
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/BubbleElements.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+public class BubbleElements
+{
+	protected Point points;
+	
+	public Point getPoints()
+	{
+		return this.points;
+	}
+	
+	public BubbleElements setPoints(final Point points)
+	{
+		this.points = points;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Fill.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Fill.java
new file mode 100644
index 0000000..9092807
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Fill.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import software.xdev.chartjs.model.enums.FillMode;
+
+
+/**
+ * <p>
+ * Option on the dataset object which can be used to create area between two datasets or a dataset and a boundary.
+ * </p>
+ */
+public class Fill<T>
+{
+	@SuppressWarnings("java:S1700") // Used inside JSON model
+	@JsonValue
+	protected T fill;
+	
+	public Fill()
+	{
+	}
+	
+	/**
+	 * @param fill - If true, fill the area under the line
+	 */
+	@SuppressWarnings("unchecked") // Support for legacy
+	public Fill(final Boolean fill)
+	{
+		this.fill = (T)fill;
+	}
+	
+	/**
+	 * @param index - Absolute dataset index
+	 */
+	@SuppressWarnings("unchecked") // Support for legacy
+	public Fill(final String index)
+	{
+		this.fill = (T)index;
+	}
+	
+	/**
+	 * @param index - Relative dataset index
+	 */
+	@SuppressWarnings("unchecked") // Support for legacy
+	public Fill(final Integer index)
+	{
+		this.fill = (T)index;
+	}
+	
+	@SuppressWarnings("unchecked") // Support for legacy
+	public Fill(final FillMode boundary)
+	{
+		this.fill = (T)boundary;
+	}
+	
+	public T getFill()
+	{
+		return this.fill;
+	}
+	
+	public void setFill(final T fill)
+	{
+		this.fill = fill;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Line.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Line.java
new file mode 100644
index 0000000..969f226
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Line.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+import java.util.List;
+
+import software.xdev.chartjs.model.enums.BorderCapStyle;
+import software.xdev.chartjs.model.enums.BorderJoinStyle;
+
+
+/**
+ * <p>
+ * Line elements are used to represent the line in a line chart.
+ * </p>
+ * <p>
+ * When set, these options apply to all objects of that type unless specifically overridden by the configuration
+ * attached to a dataset.
+ * </p>
+ */
+public class Line
+{
+	protected Float tension;
+	protected Object backgroundColor;
+	protected Integer borderWidth;
+	protected Object borderColor;
+	protected BorderCapStyle borderCapStyle;
+	protected List<Integer> borderDash;
+	protected Float borderDashOffset;
+	protected BorderJoinStyle borderJoinStyle;
+	protected Boolean capBezierPoints;
+	protected Fill<?> fill;
+	protected Boolean stepped;
+	
+	/**
+	 * @see #setTension(Float)
+	 */
+	public Float getTension()
+	{
+		return this.tension;
+	}
+	
+	/**
+	 * <p>
+	 * Default bezier curve tension. Set to 0 for no bezier curves.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 0.4}
+	 * </p>
+	 */
+	public Line setTension(final Float tension)
+	{
+		this.tension = tension;
+		return this;
+	}
+	
+	/**
+	 * @see #setBackgroundColor(Object)
+	 */
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default line fill color
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.1)'}
+	 * </p>
+	 */
+	public Line setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderWidth(Integer)
+	 */
+	public Integer getBorderWidth()
+	{
+		return this.borderWidth;
+	}
+	
+	/**
+	 * <p>
+	 * Default line stroke width
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 3}
+	 * </p>
+	 */
+	public Line setBorderWidth(final Integer borderWidth)
+	{
+		this.borderWidth = borderWidth;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderColor(Object)
+	 */
+	public Object getBorderColor()
+	{
+		return this.borderColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default line stroke color
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.1)'}
+	 * </p>
+	 */
+	public Line setBorderColor(final Object borderColor)
+	{
+		this.borderColor = borderColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderCapStyle(BorderCapStyle)
+	 */
+	public BorderCapStyle getBorderCapStyle()
+	{
+		return this.borderCapStyle;
+	}
+	
+	/**
+	 * <p>
+	 * Default line cap style.
+	 * </p>
+	 *
+	 * <ul>
+	 * <li>{@code butt} The ends of lines are squared off at the endpoints.
+	 * <li>{@code round} The ends of lines are rounded.
+	 * <li>{@code square} The ends of lines are squared off by adding a box with
+	 * an equal width and half the height of the line's thickness.
+	 * </ul>
+	 *
+	 * <p>
+	 * Default {@code 'butt'}
+	 * </p>
+	 */
+	public Line setBorderCapStyle(final BorderCapStyle borderCapStyle)
+	{
+		this.borderCapStyle = borderCapStyle;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderDash(List)
+	 */
+	public List<Integer> getBorderDash()
+	{
+		return this.borderDash;
+	}
+	
+	/**
+	 * <p>
+	 * Default line dash.
+	 * </p>
+	 *
+	 * <p>
+	 * A list of numbers that specifies distances to alternately draw a line and a gap (in coordinate space units). If
+	 * the number of elements in the array is odd, the elements of the array get copied and concatenated. For example,
+	 * [5, 15, 25] will become [5, 15, 25, 5, 15, 25].
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code []}
+	 * </p>
+	 */
+	public Line setBorderDash(final List<Integer> borderDash)
+	{
+		this.borderDash = borderDash;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderDashOffset(Float)
+	 */
+	public Float getBorderDashOffset()
+	{
+		return this.borderDashOffset;
+	}
+	
+	/**
+	 * <p>
+	 * Default line dash offset. A float specifying the amount of the offset. Initially 0.0.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 0.0}
+	 * </p>
+	 */
+	public Line setBorderDashOffset(final Float borderDashOffset)
+	{
+		this.borderDashOffset = borderDashOffset;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderJoinStyle(BorderJoinStyle)
+	 */
+	public BorderJoinStyle getBorderJoinStyle()
+	{
+		return this.borderJoinStyle;
+	}
+	
+	/**
+	 * <p>
+	 * Default line join style.
+	 * </p>
+	 * <ul>
+	 * <li>{@code round} Rounds off the corners of a shape by filling an
+	 * additional sector of disc centered at the common endpoint of connected
+	 * segments. The radius for these rounded corners is equal to the line
+	 * width.
+	 * <li>{@code bevel} Fills an additional triangular area between the common
+	 * endpoint of connected segments, and the separate outside rectangular
+	 * corners of each segment.
+	 * <li>{@code miter} Connected segments are joined by extending their
+	 * outside edges to connect at a single point, with the effect of filling an
+	 * additional lozenge-shaped area. This setting is effected by the
+	 * miterLimit property.
+	 * </ul>
+	 *
+	 * <p>
+	 * Default {@code 'miter'}
+	 * </p>
+	 */
+	public Line setBorderJoinStyle(final BorderJoinStyle borderJoinStyle)
+	{
+		this.borderJoinStyle = borderJoinStyle;
+		return this;
+	}
+	
+	/**
+	 * @see #setCapBezierPoints(Boolean)
+	 */
+	public Boolean getCapBezierPoints()
+	{
+		return this.capBezierPoints;
+	}
+	
+	/**
+	 * <p>
+	 * If true, bezier control points are kept inside the chart. If false, no restriction is enforced.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code true}
+	 * </p>
+	 */
+	public Line setCapBezierPoints(final Boolean capBezierPoints)
+	{
+		this.capBezierPoints = capBezierPoints;
+		return this;
+	}
+	
+	/**
+	 * @see #setFill(Fill)
+	 */
+	public Fill getFill()
+	{
+		return this.fill;
+	}
+	
+	/**
+	 * <p>
+	 * If true, the line is filled.
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code true}
+	 * </p>
+	 */
+	public Line setFill(final Fill<?> fill)
+	{
+		this.fill = fill;
+		return this;
+	}
+	
+	/**
+	 * @see #setStepped(Boolean)
+	 */
+	public Boolean getStepped()
+	{
+		return this.stepped;
+	}
+	
+	/**
+	 * <p>
+	 * If true, the line is shown as a steeped line and 'tension' will be ignored
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code false}
+	 * </p>
+	 */
+	public Line setStepped(final Boolean stepped)
+	{
+		this.stepped = stepped;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/LineElements.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/LineElements.java
new file mode 100644
index 0000000..658993c
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/LineElements.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+/**
+ * Line elements are used to represent the line in a line chart.
+ */
+public class LineElements
+{
+	
+	protected Line line;
+	protected Point point;
+	
+	public LineElements()
+	{
+		
+	}
+	
+	/**
+	 * Constructor
+	 *
+	 * @param line {@link Line} instance or {@code null}
+	 */
+	public LineElements(final Line line)
+	{
+		this.line = line;
+	}
+	
+	/**
+	 * Constructor
+	 *
+	 * @param point {@link Point} instance or {@code null}
+	 */
+	public LineElements(final Point point)
+	{
+		this.point = point;
+	}
+	
+	/**
+	 * Constructor
+	 *
+	 * @param line  {@link Line} instance or {@code null}
+	 * @param point {@link Point} instance or {@code null}
+	 */
+	public LineElements(final Line line, final Point point)
+	{
+		this.line = line;
+		this.point = point;
+	}
+	
+	/**
+	 * @return {@link Line} instance or {@code null} if not set
+	 * @see #setLine(Line)
+	 */
+	public Line getLine()
+	{
+		return this.line;
+	}
+	
+	/**
+	 * @param line {@link Line} instance or {@code null}
+	 * @return this {@link LineElements} instance for chaining
+	 */
+	public LineElements setLine(final Line line)
+	{
+		this.line = line;
+		return this;
+	}
+	
+	/**
+	 * @return {@link Point} instance or {@code null} if not set
+	 * @see #setPoint(Point)
+	 */
+	public Point getPoint()
+	{
+		return this.point;
+	}
+	
+	/**
+	 * @param point {@link Point} instance or {@code null}
+	 * @return this {@link LineElements} instance for chaining
+	 */
+	public LineElements setPoint(final Point point)
+	{
+		this.point = point;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Point.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Point.java
new file mode 100644
index 0000000..11d84ed
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Point.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+/**
+ * <p>
+ * Point elements are used to represent the points in a line chart or a bubble chart.
+ * </p>
+ * <p>
+ * When set, these options apply to all objects of that type unless specifically overridden by the configuration
+ * attached to a dataset.
+ * </p>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L1983">ChartJS Source</a>
+ */
+public class Point
+{
+	protected Integer radius;
+	
+	protected Object pointStyle;
+	
+	protected Object backgroundColor;
+	
+	protected Integer borderWidth;
+	
+	protected Object borderColor;
+	
+	protected Integer hitRadius;
+	
+	protected Integer hoverRadius;
+	
+	protected Integer hoverBorderWidth;
+	
+	/**
+	 * @see #setRadius(Integer)
+	 */
+	public Integer getRadius()
+	{
+		return this.radius;
+	}
+	
+	/**
+	 * <p>
+	 * Default point radius
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 3}
+	 * </p>
+	 */
+	public Point setRadius(final Integer radius)
+	{
+		this.radius = radius;
+		return this;
+	}
+	
+	public Object getPointStyle()
+	{
+		return this.pointStyle;
+	}
+	
+	/**
+	 * <p>
+	 * Default {@code 'circle'}
+	 * </p>
+	 */
+	public Point setPointStyle(final Object pointStyle)
+	{
+		this.pointStyle = pointStyle;
+		return this;
+	}
+	
+	/**
+	 * @see #setBackgroundColor(Object)
+	 */
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default point fill color
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.1)'}
+	 * </p>
+	 */
+	public Point setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderWidth(Integer)
+	 */
+	public Integer getBorderWidth()
+	{
+		return this.borderWidth;
+	}
+	
+	/**
+	 * <p>
+	 * Default point stroke width
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 1}
+	 * </p>
+	 */
+	public Point setBorderWidth(final Integer borderWidth)
+	{
+		this.borderWidth = borderWidth;
+		return this;
+	}
+	
+	/**
+	 * @see #setBorderColor(Object)
+	 */
+	public Object getBorderColor()
+	{
+		return this.borderColor;
+	}
+	
+	/**
+	 * <p>
+	 * Default point stroke color
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 'rgba(0,0,0,0.1)'}
+	 * </p>
+	 */
+	public Point setBorderColor(final Object borderColor)
+	{
+		this.borderColor = borderColor;
+		return this;
+	}
+	
+	/**
+	 * @see #setHitRadius(Integer)
+	 */
+	public Integer getHitRadius()
+	{
+		return this.hitRadius;
+	}
+	
+	/**
+	 * <p>
+	 * Extra radius added to point radius for hit detection
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 1}
+	 * </p>
+	 */
+	public Point setHitRadius(final Integer hitRadius)
+	{
+		this.hitRadius = hitRadius;
+		return this;
+	}
+	
+	/**
+	 * @see #setHoverRadius(Integer)
+	 */
+	public Integer getHoverRadius()
+	{
+		return this.hoverRadius;
+	}
+	
+	/**
+	 * <p>
+	 * Default point radius when hovered
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 4}
+	 * </p>
+	 */
+	public Point setHoverRadius(final Integer hoverRadius)
+	{
+		this.hoverRadius = hoverRadius;
+		return this;
+	}
+	
+	/**
+	 * @see #setHoverBorderWidth(Integer)
+	 */
+	public Integer getHoverBorderWidth()
+	{
+		return this.hoverBorderWidth;
+	}
+	
+	/**
+	 * <p>
+	 * Default stroke width when hovered
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 1}
+	 * </p>
+	 */
+	public Point setHoverBorderWidth(final Integer hoverBorderWidth)
+	{
+		this.hoverBorderWidth = hoverBorderWidth;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/PointElements.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/PointElements.java
new file mode 100644
index 0000000..3766d0d
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/PointElements.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+/**
+ * Point elements are used to represent the points in a line chart or a bubble chart.
+ */
+public class PointElements
+{
+	protected Point point;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param point {@link Point} instance or {@code null}
+	 */
+	public PointElements(final Point point)
+	{
+		this.point = point;
+	}
+	
+	/**
+	 * @return {@link Point} instance or {@code null} if not set
+	 * @see #setPoint(Point)
+	 */
+	public Point getPoint()
+	{
+		return this.point;
+	}
+	
+	/**
+	 * @param point {@link Point} instance or {@code null}
+	 * @return this {@link PointElements} instance for chaining
+	 */
+	public PointElements setPoint(final Point point)
+	{
+		this.point = point;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/RadarElements.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/RadarElements.java
new file mode 100644
index 0000000..5b3a41a
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/RadarElements.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+public class RadarElements
+{
+	/**
+	 * @see #setLine(RadarLine)
+	 */
+	protected RadarLine line;
+	
+	/**
+	 * @see #setLine(RadarLine)
+	 */
+	public RadarLine getLine()
+	{
+		return this.line;
+	}
+	
+	/**
+	 * Line elements are used to represent the line in a line chart. The global line options are stored in
+	 * Chart.defaults.global.elements.line.
+	 */
+	public RadarElements setLine(final RadarLine line)
+	{
+		this.line = line;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/RadarLine.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/RadarLine.java
new file mode 100644
index 0000000..d9d3962
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/RadarLine.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.elements;
+
+public class RadarLine extends Line
+{
+	/**
+	 * @see #setLineTension(Float)
+	 */
+	protected Float lineTension;
+	
+	/**
+	 * @see #setLineTension(Float)
+	 */
+	public Float getLineTension()
+	{
+		return this.lineTension;
+	}
+	
+	/**
+	 * <p>
+	 * Tension exhibited by lines when calculating splineCurve. Setting to 0 creates straight lines
+	 * </p>
+	 *
+	 * <p>
+	 * Default {@code 0}
+	 * </p>
+	 */
+	public RadarLine setLineTension(final Float lineTension)
+	{
+		this.lineTension = lineTension;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/layout/Layout.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/layout/Layout.java
new file mode 100644
index 0000000..193727e
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/layout/Layout.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.layout;
+
+/**
+ * Options to influence the layout of the chart in its canvas.
+ */
+public class Layout
+{
+	protected Object padding;
+	
+	public Object getPadding()
+	{
+		return this.padding;
+	}
+	
+	public Layout()
+	{
+		
+	}
+	
+	public Layout(final Integer padding)
+	{
+		this.padding = padding;
+	}
+	
+	public Layout(final Padding padding)
+	{
+		this.padding = padding;
+	}
+	
+	/**
+	 * Using an {@link Integer} sets the padding globally for all sides of the chart (left, top, right, bottom).
+	 *
+	 * @param padding {@link Integer} or {@code null}
+	 */
+	public Layout setPadding(final Integer padding)
+	{
+		this.padding = padding;
+		return this;
+	}
+	
+	/**
+	 * Using a {@link Padding} instance allows specifying 4 padding properties separately.
+	 *
+	 * @param padding {@link Padding} or [@code null}
+	 */
+	public Layout setPadding(final Padding padding)
+	{
+		this.padding = padding;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/layout/Padding.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/layout/Padding.java
new file mode 100644
index 0000000..8105bc9
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/layout/Padding.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.layout;
+
+public class Padding
+{
+	protected int left;
+	protected int right;
+	protected int top;
+	protected int bottom;
+	
+	public int getLeft()
+	{
+		return this.left;
+	}
+	
+	public Padding setLeft(final int left)
+	{
+		this.left = left;
+		return this;
+	}
+	
+	public int getRight()
+	{
+		return this.right;
+	}
+	
+	public Padding setRight(final int right)
+	{
+		this.right = right;
+		return this;
+	}
+	
+	public int getTop()
+	{
+		return this.top;
+	}
+	
+	public Padding setTop(final int top)
+	{
+		this.top = top;
+		return this;
+	}
+	
+	public int getBottom()
+	{
+		return this.bottom;
+	}
+	
+	public Padding setBottom(final int bottom)
+	{
+		this.bottom = bottom;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/Zoom.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/Zoom.java
new file mode 100644
index 0000000..f01fe01
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/Zoom.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom;
+
+import software.xdev.chartjs.model.options.plugins.zoom.limits.LimitOptions;
+import software.xdev.chartjs.model.options.plugins.zoom.pan.PanOptions;
+import software.xdev.chartjs.model.options.plugins.zoom.zoom.ZoomOptions;
+
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html">ChartJS docs</a>
+ */
+public class Zoom
+{
+	protected PanOptions pan;
+	protected LimitOptions limits;
+	@SuppressWarnings("java:S1700")
+	protected ZoomOptions zoom;
+	
+	public PanOptions getPan()
+	{
+		return this.pan;
+	}
+	
+	public Zoom setPan(final PanOptions pan)
+	{
+		this.pan = pan;
+		return this;
+	}
+	
+	public LimitOptions getLimits()
+	{
+		return this.limits;
+	}
+	
+	public Zoom setLimits(final LimitOptions limits)
+	{
+		this.limits = limits;
+		return this;
+	}
+	
+	public ZoomOptions getZoom()
+	{
+		return this.zoom;
+	}
+	
+	public Zoom setZoom(final ZoomOptions zoom)
+	{
+		this.zoom = zoom;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/limits/LimitOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/limits/LimitOptions.java
new file mode 100644
index 0000000..7dfb777
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/limits/LimitOptions.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom.limits;
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#limit-options">ChartJS docs</a>
+ */
+public class LimitOptions
+{
+	protected ScaleLimits x;
+	protected ScaleLimits y;
+	
+	public ScaleLimits getX()
+	{
+		return this.x;
+	}
+	
+	public LimitOptions setX(final ScaleLimits x)
+	{
+		this.x = x;
+		return this;
+	}
+	
+	public ScaleLimits getY()
+	{
+		return this.y;
+	}
+	
+	public LimitOptions setY(final ScaleLimits y)
+	{
+		this.y = y;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/limits/ScaleLimits.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/limits/ScaleLimits.java
new file mode 100644
index 0000000..f9a6051
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/limits/ScaleLimits.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom.limits;
+
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#scale-limits">ChartJS docs</a>
+ */
+public class ScaleLimits
+{
+	protected Object min;
+	protected Object max;
+	protected Number minRange;
+	
+	public Object getMin()
+	{
+		return this.min;
+	}
+	
+	public ScaleLimits setMin(final Object min)
+	{
+		this.min = min;
+		return this;
+	}
+	
+	public Object getMax()
+	{
+		return this.max;
+	}
+	
+	public ScaleLimits setMax(final Object max)
+	{
+		this.max = max;
+		return this;
+	}
+	
+	public Number getMinRange()
+	{
+		return this.minRange;
+	}
+	
+	public ScaleLimits setMinRange(final Number minRange)
+	{
+		this.minRange = minRange;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/package-info.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/package-info.java
new file mode 100644
index 0000000..59a6572
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * This package describes options for the
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest">ChartJS Zoom Plugin</a>
+ */
+package software.xdev.chartjs.model.options.plugins.zoom;
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/pan/PanOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/pan/PanOptions.java
new file mode 100644
index 0000000..d32b3ce
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/pan/PanOptions.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom.pan;
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#pan-options">ChartJS docs</a>
+ */
+public class PanOptions
+{
+	protected Boolean enabled;
+	protected String mode;
+	protected String modifierKey;
+	protected String scaleMode;
+	protected String overScaleMode;
+	protected Integer threshold;
+	
+	public Boolean getEnabled()
+	{
+		return this.enabled;
+	}
+	
+	public PanOptions setEnabled(final Boolean enabled)
+	{
+		this.enabled = enabled;
+		return this;
+	}
+	
+	public String getMode()
+	{
+		return this.mode;
+	}
+	
+	public PanOptions setMode(final String mode)
+	{
+		this.mode = mode;
+		return this;
+	}
+	
+	public String getModifierKey()
+	{
+		return this.modifierKey;
+	}
+	
+	public PanOptions setModifierKey(final String modifierKey)
+	{
+		this.modifierKey = modifierKey;
+		return this;
+	}
+	
+	public String getScaleMode()
+	{
+		return this.scaleMode;
+	}
+	
+	public PanOptions setScaleMode(final String scaleMode)
+	{
+		this.scaleMode = scaleMode;
+		return this;
+	}
+	
+	public String getOverScaleMode()
+	{
+		return this.overScaleMode;
+	}
+	
+	public PanOptions setOverScaleMode(final String overScaleMode)
+	{
+		this.overScaleMode = overScaleMode;
+		return this;
+	}
+	
+	public Integer getThreshold()
+	{
+		return this.threshold;
+	}
+	
+	public PanOptions setThreshold(final Integer threshold)
+	{
+		this.threshold = threshold;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/DragOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/DragOptions.java
new file mode 100644
index 0000000..8dc683f
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/DragOptions.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom.zoom;
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#drag-options">ChartJS docs</a>
+ */
+public class DragOptions
+{
+	protected Boolean enabled;
+	protected Object backgroundColor;
+	protected Object borderColor;
+	protected Integer borderWidth;
+	protected String drawTime;
+	protected Integer threshold;
+	protected String modifierKey;
+	
+	public Boolean getEnabled()
+	{
+		return this.enabled;
+	}
+	
+	public DragOptions setEnabled(final Boolean enabled)
+	{
+		this.enabled = enabled;
+		return this;
+	}
+	
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	public DragOptions setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this;
+	}
+	
+	public Object getBorderColor()
+	{
+		return this.borderColor;
+	}
+	
+	public DragOptions setBorderColor(final Object borderColor)
+	{
+		this.borderColor = borderColor;
+		return this;
+	}
+	
+	public Integer getBorderWidth()
+	{
+		return this.borderWidth;
+	}
+	
+	public DragOptions setBorderWidth(final Integer borderWidth)
+	{
+		this.borderWidth = borderWidth;
+		return this;
+	}
+	
+	public String getDrawTime()
+	{
+		return this.drawTime;
+	}
+	
+	public DragOptions setDrawTime(final String drawTime)
+	{
+		this.drawTime = drawTime;
+		return this;
+	}
+	
+	public Integer getThreshold()
+	{
+		return this.threshold;
+	}
+	
+	public DragOptions setThreshold(final Integer threshold)
+	{
+		this.threshold = threshold;
+		return this;
+	}
+	
+	public String getModifierKey()
+	{
+		return this.modifierKey;
+	}
+	
+	public DragOptions setModifierKey(final String modifierKey)
+	{
+		this.modifierKey = modifierKey;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/PinchOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/PinchOptions.java
new file mode 100644
index 0000000..99607b3
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/PinchOptions.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom.zoom;
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#pinch-options">ChartJS docs</a>
+ */
+public class PinchOptions
+{
+	protected Boolean enabled;
+	
+	public Boolean getEnabled()
+	{
+		return this.enabled;
+	}
+	
+	public PinchOptions setEnabled(final Boolean enabled)
+	{
+		this.enabled = enabled;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/WheelOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/WheelOptions.java
new file mode 100644
index 0000000..001f10d
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/WheelOptions.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom.zoom;
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#wheel-options">ChartJS docs</a>
+ */
+public class WheelOptions
+{
+	protected Boolean enabled;
+	protected Number speed;
+	protected String modifierKey;
+	
+	public Boolean getEnabled()
+	{
+		return this.enabled;
+	}
+	
+	public WheelOptions setEnabled(final Boolean enabled)
+	{
+		this.enabled = enabled;
+		return this;
+	}
+	
+	public Number getSpeed()
+	{
+		return this.speed;
+	}
+	
+	public WheelOptions setSpeed(final Number speed)
+	{
+		this.speed = speed;
+		return this;
+	}
+	
+	public String getModifierKey()
+	{
+		return this.modifierKey;
+	}
+	
+	public WheelOptions setModifierKey(final String modifierKey)
+	{
+		this.modifierKey = modifierKey;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/ZoomOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/ZoomOptions.java
new file mode 100644
index 0000000..ca66acc
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/zoom/ZoomOptions.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.plugins.zoom.zoom;
+
+/**
+ * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#zoom-options">ChartJS docs</a>
+ */
+public class ZoomOptions
+{
+	protected WheelOptions wheel;
+	protected DragOptions drag;
+	protected PinchOptions pinch;
+	protected String mode;
+	protected String scaleMode;
+	protected String overScaleMode;
+	
+	public WheelOptions getWheel()
+	{
+		return this.wheel;
+	}
+	
+	public ZoomOptions setWheel(final WheelOptions wheel)
+	{
+		this.wheel = wheel;
+		return this;
+	}
+	
+	public DragOptions getDrag()
+	{
+		return this.drag;
+	}
+	
+	public ZoomOptions setDrag(final DragOptions drag)
+	{
+		this.drag = drag;
+		return this;
+	}
+	
+	public PinchOptions getPinch()
+	{
+		return this.pinch;
+	}
+	
+	public ZoomOptions setPinch(final PinchOptions pinch)
+	{
+		this.pinch = pinch;
+		return this;
+	}
+	
+	public String getMode()
+	{
+		return this.mode;
+	}
+	
+	public ZoomOptions setMode(final String mode)
+	{
+		this.mode = mode;
+		return this;
+	}
+	
+	public String getScaleMode()
+	{
+		return this.scaleMode;
+	}
+	
+	public ZoomOptions setScaleMode(final String scaleMode)
+	{
+		this.scaleMode = scaleMode;
+		return this;
+	}
+	
+	public String getOverScaleMode()
+	{
+		return this.overScaleMode;
+	}
+	
+	public ZoomOptions setOverScaleMode(final String overScaleMode)
+	{
+		this.overScaleMode = overScaleMode;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/AbstractCoreScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/AbstractCoreScaleOptions.java
new file mode 100644
index 0000000..10d1e9b
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/AbstractCoreScaleOptions.java
@@ -0,0 +1,367 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale;
+
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+
+
+/**
+ * Common options to all axes
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/#common-options-to-all-axes">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L1159">ChartJS source</a>
+ */
+public abstract class AbstractCoreScaleOptions<S extends AbstractCoreScaleOptions<S, T>,
+	T extends AbstractTickOptions<?>>
+{
+	protected String type;
+	
+	protected Object display;
+	protected Boolean alignToPixels;
+	protected Object backgroundColor;
+	protected Boolean reverse;
+	protected Boolean clip;
+	protected Number weight;
+	protected Object min;
+	protected Object max;
+	protected Object stacked;
+	protected Object suggestedMax;
+	protected Object suggestedMin;
+	
+	protected T ticks;
+	
+	protected JavaScriptFunction beforeUpdate;
+	protected JavaScriptFunction beforeSetDimensions;
+	protected JavaScriptFunction afterSetDimensions;
+	protected JavaScriptFunction beforeDataLimits;
+	protected JavaScriptFunction afterDataLimits;
+	protected JavaScriptFunction beforeBuildTicks;
+	protected JavaScriptFunction afterBuildTicks;
+	protected JavaScriptFunction beforeTickToLabelConversion;
+	protected JavaScriptFunction afterTickToLabelConversion;
+	protected JavaScriptFunction beforeCalculateLabelRotation;
+	protected JavaScriptFunction afterCalculateLabelRotation;
+	protected JavaScriptFunction beforeFit;
+	protected JavaScriptFunction afterFit;
+	protected JavaScriptFunction afterUpdate;
+	
+	protected AbstractCoreScaleOptions(final String type)
+	{
+		this.type = type;
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected S self()
+	{
+		return (S)this;
+	}
+	
+	public String getType()
+	{
+		return this.type;
+	}
+	
+	public S setType(final String type)
+	{
+		this.type = type;
+		return this.self();
+	}
+	
+	public Object getDisplay()
+	{
+		return this.display;
+	}
+	
+	public S setDisplay(final Object display)
+	{
+		this.display = display;
+		return this.self();
+	}
+	
+	public Boolean getAlignToPixels()
+	{
+		return this.alignToPixels;
+	}
+	
+	public S setAlignToPixels(final Boolean alignToPixels)
+	{
+		this.alignToPixels = alignToPixels;
+		return this.self();
+	}
+	
+	public Object getBackgroundColor()
+	{
+		return this.backgroundColor;
+	}
+	
+	public S setBackgroundColor(final Object backgroundColor)
+	{
+		this.backgroundColor = backgroundColor;
+		return this.self();
+	}
+	
+	public Boolean getReverse()
+	{
+		return this.reverse;
+	}
+	
+	public S setReverse(final Boolean reverse)
+	{
+		this.reverse = reverse;
+		return this.self();
+	}
+	
+	public Boolean getClip()
+	{
+		return this.clip;
+	}
+	
+	public S setClip(final Boolean clip)
+	{
+		this.clip = clip;
+		return this.self();
+	}
+	
+	public Number getWeight()
+	{
+		return this.weight;
+	}
+	
+	public S setWeight(final Number weight)
+	{
+		this.weight = weight;
+		return this.self();
+	}
+	
+	public Object getMin()
+	{
+		return this.min;
+	}
+	
+	public S setMin(final Number min)
+	{
+		this.min = min;
+		return this.self();
+	}
+	
+	public Object getMax()
+	{
+		return this.max;
+	}
+	
+	public S setMax(final Number max)
+	{
+		this.max = max;
+		return this.self();
+	}
+	
+	public Object getStacked()
+	{
+		return this.stacked;
+	}
+	
+	public S setStacked(final Object stacked)
+	{
+		this.stacked = stacked;
+		return this.self();
+	}
+	
+	public Object getSuggestedMax()
+	{
+		return this.suggestedMax;
+	}
+	
+	public S setSuggestedMax(final Number suggestedMax)
+	{
+		this.suggestedMax = suggestedMax;
+		return this.self();
+	}
+	
+	public Object getSuggestedMin()
+	{
+		return this.suggestedMin;
+	}
+	
+	public S setSuggestedMin(final Number suggestedMin)
+	{
+		this.suggestedMin = suggestedMin;
+		return this.self();
+	}
+	
+	public T getTicks()
+	{
+		return this.ticks;
+	}
+	
+	public S setTicks(final T ticks)
+	{
+		this.ticks = ticks;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getBeforeUpdate()
+	{
+		return this.beforeUpdate;
+	}
+	
+	public S setBeforeUpdate(final JavaScriptFunction beforeUpdate)
+	{
+		this.beforeUpdate = beforeUpdate;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getBeforeSetDimensions()
+	{
+		return this.beforeSetDimensions;
+	}
+	
+	public S setBeforeSetDimensions(final JavaScriptFunction beforeSetDimensions)
+	{
+		this.beforeSetDimensions = beforeSetDimensions;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getAfterSetDimensions()
+	{
+		return this.afterSetDimensions;
+	}
+	
+	public S setAfterSetDimensions(final JavaScriptFunction afterSetDimensions)
+	{
+		this.afterSetDimensions = afterSetDimensions;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getBeforeDataLimits()
+	{
+		return this.beforeDataLimits;
+	}
+	
+	public S setBeforeDataLimits(final JavaScriptFunction beforeDataLimits)
+	{
+		this.beforeDataLimits = beforeDataLimits;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getAfterDataLimits()
+	{
+		return this.afterDataLimits;
+	}
+	
+	public S setAfterDataLimits(final JavaScriptFunction afterDataLimits)
+	{
+		this.afterDataLimits = afterDataLimits;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getBeforeBuildTicks()
+	{
+		return this.beforeBuildTicks;
+	}
+	
+	public S setBeforeBuildTicks(final JavaScriptFunction beforeBuildTicks)
+	{
+		this.beforeBuildTicks = beforeBuildTicks;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getAfterBuildTicks()
+	{
+		return this.afterBuildTicks;
+	}
+	
+	public S setAfterBuildTicks(final JavaScriptFunction afterBuildTicks)
+	{
+		this.afterBuildTicks = afterBuildTicks;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getBeforeTickToLabelConversion()
+	{
+		return this.beforeTickToLabelConversion;
+	}
+	
+	public S setBeforeTickToLabelConversion(final JavaScriptFunction beforeTickToLabelConversion)
+	{
+		this.beforeTickToLabelConversion = beforeTickToLabelConversion;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getAfterTickToLabelConversion()
+	{
+		return this.afterTickToLabelConversion;
+	}
+	
+	public S setAfterTickToLabelConversion(final JavaScriptFunction afterTickToLabelConversion)
+	{
+		this.afterTickToLabelConversion = afterTickToLabelConversion;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getBeforeCalculateLabelRotation()
+	{
+		return this.beforeCalculateLabelRotation;
+	}
+	
+	public S setBeforeCalculateLabelRotation(final JavaScriptFunction beforeCalculateLabelRotation)
+	{
+		this.beforeCalculateLabelRotation = beforeCalculateLabelRotation;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getAfterCalculateLabelRotation()
+	{
+		return this.afterCalculateLabelRotation;
+	}
+	
+	public S setAfterCalculateLabelRotation(final JavaScriptFunction afterCalculateLabelRotation)
+	{
+		this.afterCalculateLabelRotation = afterCalculateLabelRotation;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getBeforeFit()
+	{
+		return this.beforeFit;
+	}
+	
+	public S setBeforeFit(final JavaScriptFunction beforeFit)
+	{
+		this.beforeFit = beforeFit;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getAfterFit()
+	{
+		return this.afterFit;
+	}
+	
+	public S setAfterFit(final JavaScriptFunction afterFit)
+	{
+		this.afterFit = afterFit;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getAfterUpdate()
+	{
+		return this.afterUpdate;
+	}
+	
+	public S setAfterUpdate(final JavaScriptFunction afterUpdate)
+	{
+		this.afterUpdate = afterUpdate;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/AbstractTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/AbstractTickOptions.java
new file mode 100644
index 0000000..66982c8
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/AbstractTickOptions.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale;
+
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+import software.xdev.chartjs.model.options.Font;
+
+
+/**
+ * Common Tick Options to all axes.
+ *
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/#common-tick-options-to-all-axes">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3026">ChartJS source</a>
+ */
+public abstract class AbstractTickOptions<T extends AbstractTickOptions<T>>
+{
+	protected Object backdropColor;
+	protected Object backdropPadding;
+	protected JavaScriptFunction callback;
+	protected Boolean display;
+	protected Object color;
+	protected Font font;
+	protected MajorTickConfiguration major;
+	protected Number padding;
+	protected Boolean showLabelBackdrop;
+	protected Object textStrokeColor;
+	protected Number textStrokeWidth;
+	protected Number z;
+	
+	public Object getBackdropColor()
+	{
+		return this.backdropColor;
+	}
+	
+	public T setBackdropColor(final Object backdropColor)
+	{
+		this.backdropColor = backdropColor;
+		return this.self();
+	}
+	
+	public Object getBackdropPadding()
+	{
+		return this.backdropPadding;
+	}
+	
+	public T setBackdropPadding(final Object backdropPadding)
+	{
+		this.backdropPadding = backdropPadding;
+		return this.self();
+	}
+	
+	public JavaScriptFunction getCallback()
+	{
+		return this.callback;
+	}
+	
+	public T setCallback(final JavaScriptFunction callback)
+	{
+		this.callback = callback;
+		return this.self();
+	}
+	
+	public Boolean getDisplay()
+	{
+		return this.display;
+	}
+	
+	public T setDisplay(final Boolean display)
+	{
+		this.display = display;
+		return this.self();
+	}
+	
+	public Object getColor()
+	{
+		return this.color;
+	}
+	
+	public T setColor(final Object color)
+	{
+		this.color = color;
+		return this.self();
+	}
+	
+	public Font getFont()
+	{
+		return this.font;
+	}
+	
+	public T setFont(final Font font)
+	{
+		this.font = font;
+		return this.self();
+	}
+	
+	public MajorTickConfiguration getMajor()
+	{
+		return this.major;
+	}
+	
+	public T setMajor(final MajorTickConfiguration major)
+	{
+		this.major = major;
+		return this.self();
+	}
+	
+	public Number getPadding()
+	{
+		return this.padding;
+	}
+	
+	public T setPadding(final Number padding)
+	{
+		this.padding = padding;
+		return this.self();
+	}
+	
+	public Boolean getShowLabelBackdrop()
+	{
+		return this.showLabelBackdrop;
+	}
+	
+	public T setShowLabelBackdrop(final Boolean showLabelBackdrop)
+	{
+		this.showLabelBackdrop = showLabelBackdrop;
+		return this.self();
+	}
+	
+	public Object getTextStrokeColor()
+	{
+		return this.textStrokeColor;
+	}
+	
+	public T setTextStrokeColor(final Object textStrokeColor)
+	{
+		this.textStrokeColor = textStrokeColor;
+		return this.self();
+	}
+	
+	public Number getTextStrokeWidth()
+	{
+		return this.textStrokeWidth;
+	}
+	
+	public T setTextStrokeWidth(final Number textStrokeWidth)
+	{
+		this.textStrokeWidth = textStrokeWidth;
+		return this.self();
+	}
+	
+	public Number getZ()
+	{
+		return this.z;
+	}
+	
+	public T setZ(final Number z)
+	{
+		this.z = z;
+		return this.self();
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected T self()
+	{
+		return (T)this;
+	}
+	
+	/**
+	 * Defines options for the major tick marks that are generated by the axis.
+	 *
+	 * @see <a href="https://www.chartjs.org/docs/latest/axes/styling.html#major-tick-configuration">ChartJS Docs</a>
+	 * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3081">ChasrtJS Source</a>
+	 */
+	public static class MajorTickConfiguration
+	{
+		protected Boolean enabled;
+		
+		public Boolean getEnabled()
+		{
+			return this.enabled;
+		}
+		
+		public MajorTickConfiguration setEnabled(final Boolean enabled)
+		{
+			this.enabled = enabled;
+			return this;
+		}
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/CoreScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/CoreScaleOptions.java
new file mode 100644
index 0000000..6051b2e
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/CoreScaleOptions.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale;
+
+public class CoreScaleOptions extends AbstractCoreScaleOptions<CoreScaleOptions, TickOptions>
+{
+	public CoreScaleOptions()
+	{
+		super(null);
+	}
+	
+	public CoreScaleOptions(final String type)
+	{
+		super(type);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/GridLineConfiguration.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/GridLineConfiguration.java
new file mode 100644
index 0000000..63ffe34
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/GridLineConfiguration.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale;
+
+import software.xdev.chartjs.model.objects.OptionalArray;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.7/src/types/index.d.ts#L2977">ChartJS Source</a>
+ */
+public class GridLineConfiguration
+{
+	protected Boolean display;
+	protected Boolean circular;
+	protected Object color;
+	protected Object lineWidth;
+	protected Boolean drawOnChartArea;
+	protected Boolean drawTicks;
+	protected Object tickBorderDash = new OptionalArray<>();
+	protected Object tickBorderDashOffset;
+	protected Object tickColor;
+	protected Number tickLength;
+	protected Number tickWidth;
+	protected Boolean offset;
+	protected Number z;
+	
+	public Boolean getDisplay()
+	{
+		return this.display;
+	}
+	
+	public GridLineConfiguration setDisplay(final Boolean display)
+	{
+		this.display = display;
+		return this;
+	}
+	
+	public Boolean getCircular()
+	{
+		return this.circular;
+	}
+	
+	public GridLineConfiguration setCircular(final Boolean circular)
+	{
+		this.circular = circular;
+		return this;
+	}
+	
+	public Object getColor()
+	{
+		return this.color;
+	}
+	
+	public GridLineConfiguration setColor(final Object color)
+	{
+		this.color = color;
+		return this;
+	}
+	
+	public Object getLineWidth()
+	{
+		return this.lineWidth;
+	}
+	
+	public GridLineConfiguration setLineWidth(final Object lineWidth)
+	{
+		this.lineWidth = lineWidth;
+		return this;
+	}
+	
+	public Boolean getDrawOnChartArea()
+	{
+		return this.drawOnChartArea;
+	}
+	
+	public GridLineConfiguration setDrawOnChartArea(final Boolean drawOnChartArea)
+	{
+		this.drawOnChartArea = drawOnChartArea;
+		return this;
+	}
+	
+	public Boolean getDrawTicks()
+	{
+		return this.drawTicks;
+	}
+	
+	public GridLineConfiguration setDrawTicks(final Boolean drawTicks)
+	{
+		this.drawTicks = drawTicks;
+		return this;
+	}
+	
+	public Object getTickBorderDash()
+	{
+		return this.tickBorderDash;
+	}
+	
+	public GridLineConfiguration setTickBorderDash(final Object tickBorderDash)
+	{
+		this.tickBorderDash = tickBorderDash;
+		return this;
+	}
+	
+	public Object getTickBorderDashOffset()
+	{
+		return this.tickBorderDashOffset;
+	}
+	
+	public GridLineConfiguration setTickBorderDashOffset(final Object tickBorderDashOffset)
+	{
+		this.tickBorderDashOffset = tickBorderDashOffset;
+		return this;
+	}
+	
+	public Object getTickColor()
+	{
+		return this.tickColor;
+	}
+	
+	public GridLineConfiguration setTickColor(final Object tickColor)
+	{
+		this.tickColor = tickColor;
+		return this;
+	}
+	
+	public Number getTickLength()
+	{
+		return this.tickLength;
+	}
+	
+	public void setTickLength(final Number tickLength)
+	{
+		this.tickLength = tickLength;
+	}
+	
+	public Number getTickWidth()
+	{
+		return this.tickWidth;
+	}
+	
+	public GridLineConfiguration setTickWidth(final Number tickWidth)
+	{
+		this.tickWidth = tickWidth;
+		return this;
+	}
+	
+	public Boolean getOffset()
+	{
+		return this.offset;
+	}
+	
+	public GridLineConfiguration setOffset(final Boolean offset)
+	{
+		this.offset = offset;
+		return this;
+	}
+	
+	public Number getZ()
+	{
+		return this.z;
+	}
+	
+	public GridLineConfiguration setZ(final Number z)
+	{
+		this.z = z;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/Scales.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/Scales.java
new file mode 100644
index 0000000..2549058
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/Scales.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public class Scales
+{
+	@JsonIgnore
+	Map<String, Object> scalesList = new LinkedHashMap<>();
+	
+	@JsonAnyGetter
+	public Map<String, Object> getScalesList()
+	{
+		return this.scalesList;
+	}
+	
+	public Scales addScale(final String customScaleName, final AbstractCoreScaleOptions<?, ?> scale)
+	{
+		this.getScalesList().put(customScaleName, scale);
+		return this;
+	}
+	
+	public Scales addScale(final ScaleAxis axis, final AbstractCoreScaleOptions<?, ?> scale)
+	{
+		return this.addScale(axis.toString(), scale);
+	}
+	
+	public enum ScaleAxis
+	{
+		R,
+		X,
+		Y;
+		
+		@JsonValue
+		@Override
+		public String toString()
+		{
+			return super.toString().toLowerCase();
+		}
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/TickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/TickOptions.java
new file mode 100644
index 0000000..a258b40
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/TickOptions.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale;
+
+public class TickOptions extends AbstractTickOptions<TickOptions>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/AbstractCartesianScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/AbstractCartesianScaleOptions.java
new file mode 100644
index 0000000..455c7d2
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/AbstractCartesianScaleOptions.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian;
+
+import software.xdev.chartjs.model.options.Font;
+import software.xdev.chartjs.model.options.scale.AbstractCoreScaleOptions;
+import software.xdev.chartjs.model.options.scale.GridLineConfiguration;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/#common-tick-options-to-all-cartesian-axes">ChartJS docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3168">ChartJS source</a>
+ */
+public abstract class AbstractCartesianScaleOptions<
+	S extends AbstractCartesianScaleOptions<S, T>,
+	T extends AbstractCartesianTickOptions<?>>
+	extends AbstractCoreScaleOptions<S, T>
+{
+	protected String bounds;
+	protected Object position;
+	protected String stack;
+	protected Number stackWeight;
+	protected String axis;
+	protected Boolean offset;
+	protected Title title;
+	protected BorderConfiguration border;
+	protected GridLineConfiguration grid;
+	// stacked is already defined in parent
+	
+	protected AbstractCartesianScaleOptions(final String type)
+	{
+		super(type);
+	}
+	
+	public String getBounds()
+	{
+		return this.bounds;
+	}
+	
+	public S setBounds(final String bounds)
+	{
+		this.bounds = bounds;
+		return this.self();
+	}
+	
+	public Object getPosition()
+	{
+		return this.position;
+	}
+	
+	public S setPosition(final Object position)
+	{
+		this.position = position;
+		return this.self();
+	}
+	
+	public String getStack()
+	{
+		return this.stack;
+	}
+	
+	public S setStack(final String stack)
+	{
+		this.stack = stack;
+		return this.self();
+	}
+	
+	public Number getStackWeight()
+	{
+		return this.stackWeight;
+	}
+	
+	public S setStackWeight(final Number stackWeight)
+	{
+		this.stackWeight = stackWeight;
+		return this.self();
+	}
+	
+	public String getAxis()
+	{
+		return this.axis;
+	}
+	
+	public S setAxis(final String axis)
+	{
+		this.axis = axis;
+		return this.self();
+	}
+	
+	public Boolean getOffset()
+	{
+		return this.offset;
+	}
+	
+	public S setOffset(final Boolean offset)
+	{
+		this.offset = offset;
+		return this.self();
+	}
+	
+	public Title getTitle()
+	{
+		return this.title;
+	}
+	
+	public S setTitle(final Title title)
+	{
+		this.title = title;
+		return this.self();
+	}
+	
+	public BorderConfiguration getBorder()
+	{
+		return this.border;
+	}
+	
+	public S setBorder(final BorderConfiguration border)
+	{
+		this.border = border;
+		return this.self();
+	}
+	
+	public GridLineConfiguration getGrid()
+	{
+		return this.grid;
+	}
+	
+	public S setGrid(final GridLineConfiguration grid)
+	{
+		this.grid = grid;
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3220">ChartJS source</a>
+	 */
+	public static class Title
+	{
+		protected Boolean display;
+		protected String align;
+		protected String text;
+		protected String color;
+		protected Font font;
+		protected Object padding;
+		
+		public Boolean getDisplay()
+		{
+			return this.display;
+		}
+		
+		public Title setDisplay(final Boolean display)
+		{
+			this.display = display;
+			return this;
+		}
+		
+		public String getAlign()
+		{
+			return this.align;
+		}
+		
+		public Title setAlign(final String align)
+		{
+			this.align = align;
+			return this;
+		}
+		
+		public String getText()
+		{
+			return this.text;
+		}
+		
+		public Title setText(final String text)
+		{
+			this.text = text;
+			return this;
+		}
+		
+		public String getColor()
+		{
+			return this.color;
+		}
+		
+		public Title setColor(final String color)
+		{
+			this.color = color;
+			return this;
+		}
+		
+		public Font getFont()
+		{
+			return this.font;
+		}
+		
+		public Title setFont(final Font font)
+		{
+			this.font = font;
+			return this;
+		}
+		
+		public Object getPadding()
+		{
+			return this.padding;
+		}
+		
+		public Title setPadding(final Object padding)
+		{
+			this.padding = padding;
+			return this;
+		}
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/AbstractCartesianTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/AbstractCartesianTickOptions.java
new file mode 100644
index 0000000..1d72ccc
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/AbstractCartesianTickOptions.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian;
+
+import software.xdev.chartjs.model.options.scale.AbstractTickOptions;
+
+
+/**
+ * Common tick options to all cartesian axes
+ *
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/#common-tick-options-to-all-axes">ChartJS docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3090">ChartJS source</a>
+ */
+public abstract class AbstractCartesianTickOptions<T extends AbstractCartesianTickOptions<T>>
+	extends AbstractTickOptions<T>
+{
+	protected String align;
+	protected String crossAlign;
+	protected Number sampleSize;
+	protected Boolean autoSkip;
+	protected Number autoSkipPadding;
+	protected Boolean includeBounds;
+	protected Number labelOffset;
+	protected Number maxRotation;
+	protected Number minRotation;
+	protected Boolean mirror;
+	// padding is already present in parent
+	protected Number maxTicksLimit;
+	
+	public String getAlign()
+	{
+		return this.align;
+	}
+	
+	public T setAlign(final String align)
+	{
+		this.align = align;
+		return this.self();
+	}
+	
+	public String getCrossAlign()
+	{
+		return this.crossAlign;
+	}
+	
+	public T setCrossAlign(final String crossAlign)
+	{
+		this.crossAlign = crossAlign;
+		return this.self();
+	}
+	
+	public Number getSampleSize()
+	{
+		return this.sampleSize;
+	}
+	
+	public T setSampleSize(final Number sampleSize)
+	{
+		this.sampleSize = sampleSize;
+		return this.self();
+	}
+	
+	public Boolean getAutoSkip()
+	{
+		return this.autoSkip;
+	}
+	
+	public T setAutoSkip(final Boolean autoSkip)
+	{
+		this.autoSkip = autoSkip;
+		return this.self();
+	}
+	
+	public Number getAutoSkipPadding()
+	{
+		return this.autoSkipPadding;
+	}
+	
+	public T setAutoSkipPadding(final Number autoSkipPadding)
+	{
+		this.autoSkipPadding = autoSkipPadding;
+		return this.self();
+	}
+	
+	public Boolean getIncludeBounds()
+	{
+		return this.includeBounds;
+	}
+	
+	public T setIncludeBounds(final Boolean includeBounds)
+	{
+		this.includeBounds = includeBounds;
+		return this.self();
+	}
+	
+	public Number getLabelOffset()
+	{
+		return this.labelOffset;
+	}
+	
+	public T setLabelOffset(final Number labelOffset)
+	{
+		this.labelOffset = labelOffset;
+		return this.self();
+	}
+	
+	public Number getMaxRotation()
+	{
+		return this.maxRotation;
+	}
+	
+	public T setMaxRotation(final Number maxRotation)
+	{
+		this.maxRotation = maxRotation;
+		return this.self();
+	}
+	
+	public Number getMinRotation()
+	{
+		return this.minRotation;
+	}
+	
+	public T setMinRotation(final Number minRotation)
+	{
+		this.minRotation = minRotation;
+		return this.self();
+	}
+	
+	public Boolean getMirror()
+	{
+		return this.mirror;
+	}
+	
+	public T setMirror(final Boolean mirror)
+	{
+		this.mirror = mirror;
+		return this.self();
+	}
+	
+	public Number getMaxTicksLimit()
+	{
+		return this.maxTicksLimit;
+	}
+	
+	public T setMaxTicksLimit(final Number maxTicksLimit)
+	{
+		this.maxTicksLimit = maxTicksLimit;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/BorderConfiguration.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/BorderConfiguration.java
new file mode 100644
index 0000000..339db0b
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/BorderConfiguration.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian;
+
+import java.util.List;
+
+import software.xdev.chartjs.model.objects.OptionalArray;
+
+
+/**
+ * Border Configuration
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/styling.html#border-configuration">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L2953">ChartJS Source</a>
+ */
+public class BorderConfiguration
+{
+	protected Boolean display;
+	protected List<Number> dash = new OptionalArray<>();
+	protected Number dashOffset;
+	protected Object color;
+	protected Number width;
+	protected Number z;
+	
+	public Boolean getDisplay()
+	{
+		return this.display;
+	}
+	
+	public BorderConfiguration setDisplay(final Boolean display)
+	{
+		this.display = display;
+		return this;
+	}
+	
+	public Object getColor()
+	{
+		return this.color;
+	}
+	
+	public BorderConfiguration setColor(final Object color)
+	{
+		this.color = color;
+		return this;
+	}
+	
+	public Number getWidth()
+	{
+		return this.width;
+	}
+	
+	public BorderConfiguration setWidth(final Number width)
+	{
+		this.width = width;
+		return this;
+	}
+	
+	public List<Number> getDash()
+	{
+		return this.dash;
+	}
+	
+	public BorderConfiguration setDash(final List<Number> dash)
+	{
+		this.dash = dash;
+		return this;
+	}
+	
+	public Number getDashOffset()
+	{
+		return this.dashOffset;
+	}
+	
+	public BorderConfiguration setDashOffset(final Number dashOffset)
+	{
+		this.dashOffset = dashOffset;
+		return this;
+	}
+	
+	public Number getZ()
+	{
+		return this.z;
+	}
+	
+	public BorderConfiguration setZ(final Number z)
+	{
+		this.z = z;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/CartesianScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/CartesianScaleOptions.java
new file mode 100644
index 0000000..b121e09
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/CartesianScaleOptions.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian;
+
+public class CartesianScaleOptions extends AbstractCartesianScaleOptions<CartesianScaleOptions, CartesianTickOptions>
+{
+	public CartesianScaleOptions()
+	{
+		this(null);
+	}
+	
+	public CartesianScaleOptions(final String type)
+	{
+		super(type);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/CartesianTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/CartesianTickOptions.java
new file mode 100644
index 0000000..aad5a9a
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/CartesianTickOptions.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian;
+
+public class CartesianTickOptions extends AbstractCartesianTickOptions<CartesianTickOptions>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/category/CategoryScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/category/CategoryScaleOptions.java
new file mode 100644
index 0000000..a23ee93
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/category/CategoryScaleOptions.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.category;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianScaleOptions;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/category.html#category-axis-specific-options">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3251">ChartJS Source</a>
+ */
+public class CategoryScaleOptions extends AbstractCartesianScaleOptions<CategoryScaleOptions, CategoryTickOptions>
+{
+	protected Object labels;
+	
+	public CategoryScaleOptions()
+	{
+		super("category");
+	}
+	
+	public CategoryScaleOptions setMin(final Object min)
+	{
+		this.min = min;
+		return this.self();
+	}
+	
+	public CategoryScaleOptions setMax(final Object max)
+	{
+		this.max = max;
+		return this.self();
+	}
+	
+	public Object getLabels()
+	{
+		return this.labels;
+	}
+	
+	public CategoryScaleOptions setLabels(final Object labels)
+	{
+		this.labels = labels;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/category/CategoryTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/category/CategoryTickOptions.java
new file mode 100644
index 0000000..75b3a76
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/category/CategoryTickOptions.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.category;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianTickOptions;
+
+
+public class CategoryTickOptions extends AbstractCartesianTickOptions<CategoryTickOptions>
+{
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/linear/LinearScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/linear/LinearScaleOptions.java
new file mode 100644
index 0000000..916b113
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/linear/LinearScaleOptions.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.linear;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianScaleOptions;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/linear.html#linear-axis-specific-options">ChartJS docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3263">ChartJS Source</a>
+ */
+public class LinearScaleOptions extends AbstractCartesianScaleOptions<LinearScaleOptions, LinearTickOptions>
+{
+	protected Boolean beginAtZero;
+	protected Object grace;
+	
+	public LinearScaleOptions()
+	{
+		super("linear");
+	}
+	
+	public Boolean getBeginAtZero()
+	{
+		return this.beginAtZero;
+	}
+	
+	public LinearScaleOptions setBeginAtZero(final Boolean beginAtZero)
+	{
+		this.beginAtZero = beginAtZero;
+		return this.self();
+	}
+	
+	public Object getGrace()
+	{
+		return this.grace;
+	}
+	
+	public LinearScaleOptions setGrace(final Object grace)
+	{
+		this.grace = grace;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/linear/LinearTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/linear/LinearTickOptions.java
new file mode 100644
index 0000000..92b9750
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/linear/LinearTickOptions.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.linear;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianTickOptions;
+
+
+/**
+ * Linear Axis specific tick options
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/linear.html#linear-axis-specific-tick-options">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3283">ChartJS Source</a>
+ */
+public class LinearTickOptions extends AbstractCartesianTickOptions<LinearTickOptions>
+{
+	protected Object format;
+	protected Number precision;
+	protected Number stepSize;
+	protected Number count;
+	
+	public Object getFormat()
+	{
+		return this.format;
+	}
+	
+	public LinearTickOptions setFormat(final Object format)
+	{
+		this.format = format;
+		return this.self();
+	}
+	
+	public Number getPrecision()
+	{
+		return this.precision;
+	}
+	
+	public LinearTickOptions setPrecision(final Number precision)
+	{
+		this.precision = precision;
+		return this.self();
+	}
+	
+	public Number getStepSize()
+	{
+		return this.stepSize;
+	}
+	
+	public LinearTickOptions setStepSize(final Number stepSize)
+	{
+		this.stepSize = stepSize;
+		return this.self();
+	}
+	
+	public Number getCount()
+	{
+		return this.count;
+	}
+	
+	public LinearTickOptions setCount(final Number count)
+	{
+		this.count = count;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/logarithmic/LogarithmicScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/logarithmic/LogarithmicScaleOptions.java
new file mode 100644
index 0000000..d00796b
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/logarithmic/LogarithmicScaleOptions.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.logarithmic;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianScaleOptions;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/logarithmic.html">Chart JS</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3312">ChartJS Source</a>
+ */
+public class LogarithmicScaleOptions
+	extends AbstractCartesianScaleOptions<LogarithmicScaleOptions, LogarithmicTickOptions>
+{
+	public LogarithmicScaleOptions()
+	{
+		super("logarithmic");
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/logarithmic/LogarithmicTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/logarithmic/LogarithmicTickOptions.java
new file mode 100644
index 0000000..fb26e92
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/logarithmic/LogarithmicTickOptions.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.logarithmic;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianTickOptions;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/logarithmic.html#logarithmic-axis-specific-options">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3322">ChartJS Source</a>
+ */
+public class LogarithmicTickOptions extends AbstractCartesianTickOptions<LogarithmicTickOptions>
+{
+	protected Object format;
+	
+	public Object getFormat()
+	{
+		return this.format;
+	}
+	
+	public LogarithmicTickOptions setFormat(final Object format)
+	{
+		this.format = format;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeScaleOptions.java
new file mode 100644
index 0000000..6588938
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeScaleOptions.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.time;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianScaleOptions;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/time.html">ChartJS docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3391">ChartJS Source</a>
+ */
+public class TimeScaleOptions extends AbstractCartesianScaleOptions<TimeScaleOptions, TimeScaleTickOptions>
+{
+	protected Boolean offsetAfterAutoskip;
+	protected Adapters adapters;
+	protected TimeOptions time;
+	
+	public TimeScaleOptions()
+	{
+		this("time");
+	}
+	
+	protected TimeScaleOptions(final String type)
+	{
+		super(type);
+	}
+	
+	public TimeScaleOptions setMin(final Object min)
+	{
+		this.min = min;
+		return this.self();
+	}
+	
+	public TimeScaleOptions setMax(final Object max)
+	{
+		this.max = max;
+		return this.self();
+	}
+	
+	public TimeScaleOptions setSuggestedMin(final Object suggestedMin)
+	{
+		this.suggestedMin = suggestedMin;
+		return this.self();
+	}
+	
+	public TimeScaleOptions setSuggestedMax(final Object suggestedMax)
+	{
+		this.suggestedMax = suggestedMax;
+		return this.self();
+	}
+	
+	public Boolean getOffsetAfterAutoskip()
+	{
+		return this.offsetAfterAutoskip;
+	}
+	
+	public TimeScaleOptions setOffsetAfterAutoskip(final Boolean offsetAfterAutoskip)
+	{
+		this.offsetAfterAutoskip = offsetAfterAutoskip;
+		return this.self();
+	}
+	
+	public Adapters getAdapters()
+	{
+		return this.adapters;
+	}
+	
+	public TimeScaleOptions setAdapters(final Adapters adapters)
+	{
+		this.adapters = adapters;
+		return this.self();
+	}
+	
+	public TimeOptions getTime()
+	{
+		return this.time;
+	}
+	
+	public TimeScaleOptions setTime(final TimeOptions time)
+	{
+		this.time = time;
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3336">ChartJS Source</a>
+	 */
+	public static class TimeOptions
+	{
+		protected Object parser;
+		protected String round;
+		protected Object isoWeekday;
+		protected Object displayFormats;
+		protected String tooltipFormat;
+		protected String unit;
+		protected String minUnit;
+		
+		public Object getParser()
+		{
+			return this.parser;
+		}
+		
+		public TimeOptions setParser(final Object parser)
+		{
+			this.parser = parser;
+			return this;
+		}
+		
+		public String getRound()
+		{
+			return this.round;
+		}
+		
+		public TimeOptions setRound(final String round)
+		{
+			this.round = round;
+			return this;
+		}
+		
+		public Object getIsoWeekday()
+		{
+			return this.isoWeekday;
+		}
+		
+		public TimeOptions setIsoWeekday(final Object isoWeekday)
+		{
+			this.isoWeekday = isoWeekday;
+			return this;
+		}
+		
+		public Object getDisplayFormats()
+		{
+			return this.displayFormats;
+		}
+		
+		public TimeOptions setDisplayFormats(final Object displayFormats)
+		{
+			this.displayFormats = displayFormats;
+			return this;
+		}
+		
+		public String getTooltipFormat()
+		{
+			return this.tooltipFormat;
+		}
+		
+		public TimeOptions setTooltipFormat(final String tooltipFormat)
+		{
+			this.tooltipFormat = tooltipFormat;
+			return this;
+		}
+		
+		public String getUnit()
+		{
+			return this.unit;
+		}
+		
+		public TimeOptions setUnit(final String unit)
+		{
+			this.unit = unit;
+			return this;
+		}
+		
+		public String getMinUnit()
+		{
+			return this.minUnit;
+		}
+		
+		public TimeOptions setMinUnit(final String minUnit)
+		{
+			this.minUnit = minUnit;
+			return this;
+		}
+	}
+	
+	/**
+	 * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3415">ChartJS Source</a>
+	 */
+	public static class Adapters
+	{
+		protected Object date;
+		
+		public Object getDate()
+		{
+			return this.date;
+		}
+		
+		public Adapters setDate(final Object date)
+		{
+			this.date = date;
+			return this;
+		}
+	}
+	
+	
+	/**
+	 * Reference structure for {@link TimeScaleOptions#time}.
+	 *
+	 * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/time.html#display-formats">ChartJS Docs</a>
+	 */
+	public static class DisplayFormats
+	{
+		protected String millisecond;
+		protected String second;
+		protected String minute;
+		protected String hour;
+		protected String day;
+		protected String week;
+		protected String month;
+		protected String quarter;
+		protected String year;
+		
+		public String getMillisecond()
+		{
+			return this.millisecond;
+		}
+		
+		public DisplayFormats setMillisecond(final String millisecond)
+		{
+			this.millisecond = millisecond;
+			return this;
+		}
+		
+		public String getSecond()
+		{
+			return this.second;
+		}
+		
+		public DisplayFormats setSecond(final String second)
+		{
+			this.second = second;
+			return this;
+		}
+		
+		public String getMinute()
+		{
+			return this.minute;
+		}
+		
+		public DisplayFormats setMinute(final String minute)
+		{
+			this.minute = minute;
+			return this;
+		}
+		
+		public String getHour()
+		{
+			return this.hour;
+		}
+		
+		public DisplayFormats setHour(final String hour)
+		{
+			this.hour = hour;
+			return this;
+		}
+		
+		public String getDay()
+		{
+			return this.day;
+		}
+		
+		public DisplayFormats setDay(final String day)
+		{
+			this.day = day;
+			return this;
+		}
+		
+		public String getWeek()
+		{
+			return this.week;
+		}
+		
+		public DisplayFormats setWeek(final String week)
+		{
+			this.week = week;
+			return this;
+		}
+		
+		public String getMonth()
+		{
+			return this.month;
+		}
+		
+		public DisplayFormats setMonth(final String month)
+		{
+			this.month = month;
+			return this;
+		}
+		
+		public String getQuarter()
+		{
+			return this.quarter;
+		}
+		
+		public DisplayFormats setQuarter(final String quarter)
+		{
+			this.quarter = quarter;
+			return this;
+		}
+		
+		public String getYear()
+		{
+			return this.year;
+		}
+		
+		public DisplayFormats setYear(final String year)
+		{
+			this.year = year;
+			return this;
+		}
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeScaleTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeScaleTickOptions.java
new file mode 100644
index 0000000..eea9177
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeScaleTickOptions.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.time;
+
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianTickOptions;
+
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3373">ChartJS Source</a>
+ */
+public class TimeScaleTickOptions extends AbstractCartesianTickOptions<TimeScaleTickOptions>
+{
+	protected String source;
+	protected Number stepSize;
+	
+	public String getSource()
+	{
+		return this.source;
+	}
+	
+	public TimeScaleTickOptions setSource(final String source)
+	{
+		this.source = source;
+		return this.self();
+	}
+	
+	public Number getStepSize()
+	{
+		return this.stepSize;
+	}
+	
+	public TimeScaleTickOptions setStepSize(final Number stepSize)
+	{
+		this.stepSize = stepSize;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeSeriesScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeSeriesScaleOptions.java
new file mode 100644
index 0000000..a360d34
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/cartesian/time/TimeSeriesScaleOptions.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.cartesian.time;
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/cartesian/timeseries.html">ChartJS docs</a>
+ */
+public class TimeSeriesScaleOptions extends TimeScaleOptions
+{
+	public TimeSeriesScaleOptions()
+	{
+		super("timeseries");
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/AngleLines.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/AngleLines.java
new file mode 100644
index 0000000..79a5e3e
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/AngleLines.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.radial;
+
+import java.util.List;
+
+import software.xdev.chartjs.model.objects.OptionalArray;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/radial/linear.html#angle-line-options">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3475">ChartJS source</a>
+ */
+public class AngleLines
+{
+	protected Boolean display;
+	protected Object color;
+	protected Number lineWidth;
+	protected List<Number> borderDash = new OptionalArray<>();
+	protected Number borderDashOffset;
+	
+	public Boolean getDisplay()
+	{
+		return this.display;
+	}
+	
+	public AngleLines setDisplay(final Boolean display)
+	{
+		this.display = display;
+		return this;
+	}
+	
+	public Object getColor()
+	{
+		return this.color;
+	}
+	
+	public AngleLines setColor(final Object color)
+	{
+		this.color = color;
+		return this;
+	}
+	
+	public Number getLineWidth()
+	{
+		return this.lineWidth;
+	}
+	
+	public AngleLines setLineWidth(final Number lineWidth)
+	{
+		this.lineWidth = lineWidth;
+		return this;
+	}
+	
+	public List<Number> getBorderDash()
+	{
+		return this.borderDash;
+	}
+	
+	public AngleLines setBorderDash(final List<Number> borderDash)
+	{
+		this.borderDash = borderDash;
+		return this;
+	}
+	
+	public Number getBorderDashOffset()
+	{
+		return this.borderDashOffset;
+	}
+	
+	public AngleLines setBorderDashOffset(final Number borderDashOffset)
+	{
+		this.borderDashOffset = borderDashOffset;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/PointLabels.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/PointLabels.java
new file mode 100644
index 0000000..fb0c59f
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/PointLabels.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.radial;
+
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+import software.xdev.chartjs.model.options.Font;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/radial/linear.html#point-label-options">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3520">ChartJS Source</a>
+ */
+public class PointLabels
+{
+	protected Object backdropColor;
+	protected Object backdropPadding;
+	protected Object borderRadius;
+	protected Object display;
+	protected JavaScriptFunction callback;
+	protected Object color;
+	protected Font font;
+	protected Number padding;
+	protected Boolean centerPointLabels;
+	
+	public Object getBackdropColor()
+	{
+		return this.backdropColor;
+	}
+	
+	public PointLabels setBackdropColor(final Object backdropColor)
+	{
+		this.backdropColor = backdropColor;
+		return this;
+	}
+	
+	public Object getBackdropPadding()
+	{
+		return this.backdropPadding;
+	}
+	
+	public PointLabels setBackdropPadding(final Object backdropPadding)
+	{
+		this.backdropPadding = backdropPadding;
+		return this;
+	}
+	
+	public Object getBorderRadius()
+	{
+		return this.borderRadius;
+	}
+	
+	public PointLabels setBorderRadius(final Object borderRadius)
+	{
+		this.borderRadius = borderRadius;
+		return this;
+	}
+	
+	public Object getDisplay()
+	{
+		return this.display;
+	}
+	
+	public PointLabels setDisplay(final Object display)
+	{
+		this.display = display;
+		return this;
+	}
+	
+	public JavaScriptFunction getCallback()
+	{
+		return this.callback;
+	}
+	
+	public PointLabels setCallback(final JavaScriptFunction callback)
+	{
+		this.callback = callback;
+		return this;
+	}
+	
+	public Object getColor()
+	{
+		return this.color;
+	}
+	
+	public PointLabels setColor(final Object color)
+	{
+		this.color = color;
+		return this;
+	}
+	
+	public Font getFont()
+	{
+		return this.font;
+	}
+	
+	public PointLabels setFont(final Font font)
+	{
+		this.font = font;
+		return this;
+	}
+	
+	public Number getPadding()
+	{
+		return this.padding;
+	}
+	
+	public PointLabels setPadding(final Number padding)
+	{
+		this.padding = padding;
+		return this;
+	}
+	
+	public Boolean getCenterPointLabels()
+	{
+		return this.centerPointLabels;
+	}
+	
+	public PointLabels setCenterPointLabels(final Boolean centerPointLabels)
+	{
+		this.centerPointLabels = centerPointLabels;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/RadialLinearScaleOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/RadialLinearScaleOptions.java
new file mode 100644
index 0000000..a6bd091
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/RadialLinearScaleOptions.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.radial;
+
+import software.xdev.chartjs.model.options.scale.AbstractCoreScaleOptions;
+import software.xdev.chartjs.model.options.scale.GridLineConfiguration;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/radial/linear.html#linear-radial-axis-specific-options">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3470">ChartJS Source</a>
+ */
+public class RadialLinearScaleOptions extends AbstractCoreScaleOptions<RadialLinearScaleOptions, RadialTickOptions>
+{
+	protected Boolean animate;
+	protected Number startAngle;
+	protected AngleLines angleLines;
+	protected Boolean beginAtZero;
+	protected PointLabels pointLabels;
+	protected GridLineConfiguration grid;
+	
+	public RadialLinearScaleOptions()
+	{
+		super("radialLinear");
+	}
+	
+	public Boolean getAnimate()
+	{
+		return this.animate;
+	}
+	
+	public RadialLinearScaleOptions setAnimate(final Boolean animate)
+	{
+		this.animate = animate;
+		return this.self();
+	}
+	
+	public Number getStartAngle()
+	{
+		return this.startAngle;
+	}
+	
+	public RadialLinearScaleOptions setStartAngle(final Number startAngle)
+	{
+		this.startAngle = startAngle;
+		return this.self();
+	}
+	
+	public AngleLines getAngleLines()
+	{
+		return this.angleLines;
+	}
+	
+	public RadialLinearScaleOptions setAngleLines(final AngleLines angleLines)
+	{
+		this.angleLines = angleLines;
+		return this.self();
+	}
+	
+	public Boolean getBeginAtZero()
+	{
+		return this.beginAtZero;
+	}
+	
+	public RadialLinearScaleOptions setBeginAtZero(final Boolean beginAtZero)
+	{
+		this.beginAtZero = beginAtZero;
+		return this.self();
+	}
+	
+	public PointLabels getPointLabels()
+	{
+		return this.pointLabels;
+	}
+	
+	public RadialLinearScaleOptions setPointLabels(final PointLabels pointLabels)
+	{
+		this.pointLabels = pointLabels;
+		return this.self();
+	}
+	
+	public GridLineConfiguration getGrid()
+	{
+		return this.grid;
+	}
+	
+	public RadialLinearScaleOptions setGrid(final GridLineConfiguration grid)
+	{
+		this.grid = grid;
+		return this.self();
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/RadialTickOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/RadialTickOptions.java
new file mode 100644
index 0000000..70348d7
--- /dev/null
+++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/radial/RadialTickOptions.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.options.scale.radial;
+
+import software.xdev.chartjs.model.options.scale.AbstractTickOptions;
+
+
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/radial/linear.html#linear-radial-axis-specific-tick-options">ChartJS Docs</a>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L3442">ChartJS source</a>
+ */
+public class RadialTickOptions extends AbstractTickOptions<RadialTickOptions>
+{
+	protected Number count;
+	protected Object format;
+	protected Number maxTickLimits;
+	protected Number precision;
+	protected Number stepSize;
+	
+	public Number getCount()
+	{
+		return this.count;
+	}
+	
+	public RadialTickOptions setCount(final Number count)
+	{
+		this.count = count;
+		return this;
+	}
+	
+	public Object getFormat()
+	{
+		return this.format;
+	}
+	
+	public RadialTickOptions setFormat(final Object format)
+	{
+		this.format = format;
+		return this;
+	}
+	
+	public Number getMaxTickLimits()
+	{
+		return this.maxTickLimits;
+	}
+	
+	public RadialTickOptions setMaxTickLimits(final Number maxTickLimits)
+	{
+		this.maxTickLimits = maxTickLimits;
+		return this;
+	}
+	
+	public Number getPrecision()
+	{
+		return this.precision;
+	}
+	
+	public RadialTickOptions setPrecision(final Number precision)
+	{
+		this.precision = precision;
+		return this;
+	}
+	
+	public Number getStepSize()
+	{
+		return this.stepSize;
+	}
+	
+	public RadialTickOptions setStepSize(final Number stepSize)
+	{
+		this.stepSize = stepSize;
+		return this;
+	}
+}
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/AbstractChartTest.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/AbstractChartTest.java
new file mode 100644
index 0000000..8d50df4
--- /dev/null
+++ b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/AbstractChartTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+import org.testcontainers.utility.MountableFile;
+
+import software.xdev.chartjs.model.charts.Chart;
+import software.xdev.chartjs.model.container.SeleniumBrowserWebDriverContainer;
+import software.xdev.testcontainers.selenium.containers.browser.BrowserWebDriverContainer;
+
+
+public abstract class AbstractChartTest
+{
+	protected static final String SCREENSHOTS_FOR_FAILURE = "./target/screenshots/";
+	protected static final String RESOURCES_SCREENSHOT_REFERENCES = "./src/test/resources/screenshotReferences/";
+	protected static final String SCREENSHOT_SUFFIX = ".png";
+	
+	protected static final String TEST_TEMPLATE_HTML_FILE = "test-template.html";
+	protected static final String CONTAINER_TEST_TEMPLATE_HTML_FILE = "/home/user/" + TEST_TEMPLATE_HTML_FILE;
+	
+	// One Container is started once and only the rendered HTML is changed. Improves performance.
+	protected static final SeleniumBrowserWebDriverContainer WEB_CONTAINER = createBrowserWithTempDirectoryMounted();
+	
+	private static SeleniumBrowserWebDriverContainer createBrowserWithTempDirectoryMounted()
+	{
+		if(!SLF4JBridgeHandler.isInstalled())
+		{
+			SLF4JBridgeHandler.removeHandlersForRootLogger();
+			SLF4JBridgeHandler.install();
+		}
+		
+		final SeleniumBrowserWebDriverContainer browserContainer =
+			new SeleniumBrowserWebDriverContainer(new ChromeOptions())
+				.withRecordingMode(BrowserWebDriverContainer.RecordingMode.SKIP)
+				.withCopyFileToContainer(
+					MountableFile.forClasspathResource("/" + TEST_TEMPLATE_HTML_FILE),
+					CONTAINER_TEST_TEMPLATE_HTML_FILE);
+		browserContainer.start();
+		return browserContainer;
+	}
+	
+	protected SeleniumBrowserWebDriverContainer getWebContainer()
+	{
+		return WEB_CONTAINER;
+	}
+	
+	protected void createScreenshotAndCompare(
+		final Chart<?, ?, ?> chart,
+		final SeleniumBrowserWebDriverContainer browserContainer,
+		final String screenshotReference)
+	{
+		try
+		{
+			browserContainer.webDriver().get("file://" + CONTAINER_TEST_TEMPLATE_HTML_FILE);
+			browserContainer.webDriver().executeScript(
+				String.format(
+					"new Chart(document.getElementById('c').getContext('2d'), %s)",
+					chart.toJson()));
+			this.assertCurrentBrowserViewEqualsScreenshot(
+				browserContainer,
+				chart.getClass().getSimpleName() + screenshotReference);
+		}
+		catch(final IOException ioe)
+		{
+			throw new UncheckedIOException(ioe);
+		}
+	}
+	
+	protected void assertCurrentBrowserViewEqualsScreenshot(
+		final SeleniumBrowserWebDriverContainer browserContainer,
+		final String screenshotReference) throws IOException
+	{
+		final byte[] actual = browserContainer.webDriver().getScreenshotAs(OutputType.BYTES);
+		
+		byte[] expected = new byte[0];
+		
+		final String screenShotName = screenshotReference + SCREENSHOT_SUFFIX;
+		final Path screenshotReferenceResourcePath = Path.of(RESOURCES_SCREENSHOT_REFERENCES, screenShotName);
+		if(Files.exists(screenshotReferenceResourcePath))
+		{
+			expected = Files.readAllBytes(screenshotReferenceResourcePath);
+		}
+		
+		final boolean arraysMatch = Arrays.equals(expected, actual);
+		
+		if(!arraysMatch)
+		{
+			final Path path = Path.of(SCREENSHOTS_FOR_FAILURE, screenShotName);
+			Files.createDirectories(path.getParent());
+			Files.write(path, actual);
+			assertArrayEquals(expected, actual);
+		}
+	}
+}
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BarChartTest.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BarChartTest.java
new file mode 100644
index 0000000..d08b238
--- /dev/null
+++ b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BarChartTest.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model;
+
+import java.math.BigDecimal;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+import software.xdev.chartjs.model.charts.BarChart;
+import software.xdev.chartjs.model.color.RGBAColor;
+import software.xdev.chartjs.model.data.BarData;
+import software.xdev.chartjs.model.datapoint.XYDataPoint;
+import software.xdev.chartjs.model.dataset.BarDataset;
+import software.xdev.chartjs.model.enums.IndexAxis;
+import software.xdev.chartjs.model.options.BarOptions;
+import software.xdev.chartjs.model.options.scale.Scales;
+import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianScaleOptions;
+import software.xdev.chartjs.model.options.scale.cartesian.CartesianScaleOptions;
+import software.xdev.chartjs.model.options.scale.cartesian.linear.LinearScaleOptions;
+import software.xdev.chartjs.model.options.scale.cartesian.linear.LinearTickOptions;
+
+
+@SuppressWarnings("java:S2699") // Done in custom method
+class BarChartTest extends AbstractChartTest
+{
+	@Test
+	void testScaleChecked()
+	{
+		this.testScale(BarDataset::addData);
+	}
+	
+	@Test
+	void testScaleUncheckedData()
+	{
+		this.testScale((dataset, value) -> dataset.addDataUnchecked(new XYDataPoint(value, value)));
+	}
+	
+	void testScale(final BiConsumer<BarDataset, BigDecimal> addDataFunc)
+	{
+		final BarDataset dataset = new BarDataset();
+		final BarData data = new BarData();
+		data.addDataset(dataset);
+		for(final Map.Entry<String, BigDecimal> entry : IntStream.rangeClosed(0, 3)
+			.boxed()
+			.collect(Collectors.toMap(String::valueOf, BigDecimal::valueOf))
+			.entrySet())
+		{
+			data.addLabel(entry.getKey());
+			addDataFunc.accept(dataset, entry.getValue());
+		}
+		
+		final BarOptions barOptions = new BarOptions()
+			.setAnimation(false);
+		
+		barOptions
+			.getScales()
+			.addScale(
+				Scales.ScaleAxis.Y,
+				new LinearScaleOptions()
+					.setTitle(new AbstractCartesianScaleOptions.Title().setText("Test"))
+					.setMax(BigDecimal.valueOf(2)));
+		
+		final BarChart chart = new BarChart()
+			.setOptions(barOptions)
+			.setData(data);
+		
+		this.createScreenshotAndCompare(
+			chart,
+			this.getWebContainer(),
+			"Scale");
+	}
+	
+	@Test
+	void testStacked()
+	{
+		final BarOptions options = new BarOptions()
+			.setAnimation(false);
+		options
+			.getScales()
+			.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))
+			.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
+		
+		this.createScreenshotAndCompare(
+			new BarChart(createDefaultTwoDatasetBarData(), options),
+			this.getWebContainer(),
+			"Stacked"
+		);
+	}
+	
+	@Test
+	void testTicked()
+	{
+		final BarDataset dataset1 = new BarDataset()
+			.setData(65, 59, 80)
+			.addBackgroundColors(RGBAColor.RED, RGBAColor.GREEN, RGBAColor.BLUE);
+		
+		final BarData data = new BarData()
+			.addLabels("First", "Second", "Third")
+			.addDataset(dataset1);
+		
+		final BarOptions options = new BarOptions().setAnimation(false);
+		options
+			.getScales()
+			.addScale(Scales.ScaleAxis.Y, new LinearScaleOptions()
+				.setMin(20)
+				.setMax(100)
+				.setTicks(new LinearTickOptions()
+					.setStepSize(5)));
+		
+		this.createScreenshotAndCompare(
+			new BarChart(data, options),
+			this.getWebContainer(),
+			"Ticked");
+	}
+	
+	@Test
+	void testStackedHorizontal()
+	{
+		final BarOptions options = new BarOptions()
+			.setAnimation(false)
+			.setIndexAxis(IndexAxis.Y);
+		options
+			.getScales()
+			.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))
+			.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
+		
+		this.createScreenshotAndCompare(
+			new BarChart(createDefaultTwoDatasetBarData(), options),
+			this.getWebContainer(),
+			"StackedHorizontal"
+		);
+	}
+	
+	@Test
+	void testStackedWithGroups()
+	{
+		// This test orients itself on https://www.chartjs.org/docs/4.4.0/samples/bar/stacked-groups.html
+		final BarDataset dataset1 = new BarDataset()
+			.setLabel("First stack")
+			.setData(65, 59, 80)
+			.addBackgroundColors(RGBAColor.RED, RGBAColor.RED, RGBAColor.RED)
+			.setStack("Stack 1");
+		
+		final BarDataset dataset2 = new BarDataset()
+			.setLabel("Second stack")
+			.setData(28, 45, 10)
+			.addBackgroundColors(RGBAColor.GREEN, RGBAColor.GREEN, RGBAColor.GREEN)
+			.setStack("Stack 1");
+		
+		final BarDataset dataset3 = new BarDataset()
+			.setLabel("Third stack")
+			.setData(10, 23, 45)
+			.addBackgroundColors(RGBAColor.BLUE, RGBAColor.BLUE, RGBAColor.BLUE)
+			.setStack("Stack 2");
+		
+		final BarData data = new BarData()
+			.addLabels("First", "Second", "Third")
+			.addDataset(dataset1)
+			.addDataset(dataset2)
+			.addDataset(dataset3);
+		
+		final BarOptions options = new BarOptions()
+			.setAnimation(false)
+			.setIndexAxis(IndexAxis.Y);
+		options
+			.getScales()
+			.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))
+			.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
+		
+		this.createScreenshotAndCompare(
+			new BarChart(data, options),
+			this.getWebContainer(),
+			"StackedWithGroups"
+		);
+	}
+	
+	static BarData createDefaultTwoDatasetBarData()
+	{
+		final BarDataset dataset1 = new BarDataset()
+			.setLabel("First stack")
+			.setData(65, 59, 80)
+			.addBackgroundColors(RGBAColor.RED, RGBAColor.RED, RGBAColor.RED);
+		
+		final BarDataset dataset2 = new BarDataset()
+			.setLabel("Second stack")
+			.setData(28, 45, 10)
+			.addBackgroundColors(RGBAColor.GREEN, RGBAColor.GREEN, RGBAColor.GREEN);
+		
+		return new BarData()
+			.addLabels("First", "Second", "Third")
+			.addDataset(dataset1)
+			.addDataset(dataset2);
+	}
+}
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java
new file mode 100644
index 0000000..080e387
--- /dev/null
+++ b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model;
+
+import java.math.BigDecimal;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import software.xdev.chartjs.model.charts.BarChart;
+import software.xdev.chartjs.model.charts.BubbleChart;
+import software.xdev.chartjs.model.charts.Chart;
+import software.xdev.chartjs.model.charts.DoughnutChart;
+import software.xdev.chartjs.model.charts.LineChart;
+import software.xdev.chartjs.model.charts.MixedChart;
+import software.xdev.chartjs.model.charts.PieChart;
+import software.xdev.chartjs.model.charts.PolarChart;
+import software.xdev.chartjs.model.charts.RadarChart;
+import software.xdev.chartjs.model.charts.ScatterChart;
+import software.xdev.chartjs.model.data.AbstractData;
+import software.xdev.chartjs.model.data.BarData;
+import software.xdev.chartjs.model.data.BubbleData;
+import software.xdev.chartjs.model.data.DoughnutData;
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.data.LineData;
+import software.xdev.chartjs.model.data.MixedData;
+import software.xdev.chartjs.model.data.PieData;
+import software.xdev.chartjs.model.data.PolarData;
+import software.xdev.chartjs.model.data.RadarData;
+import software.xdev.chartjs.model.data.ScatterData;
+import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
+import software.xdev.chartjs.model.datapoint.ScatterDataPoint;
+import software.xdev.chartjs.model.dataset.BarDataset;
+import software.xdev.chartjs.model.dataset.BubbleDataset;
+import software.xdev.chartjs.model.dataset.Dataset;
+import software.xdev.chartjs.model.dataset.DoughnutDataset;
+import software.xdev.chartjs.model.dataset.LineDataset;
+import software.xdev.chartjs.model.dataset.PieDataset;
+import software.xdev.chartjs.model.dataset.PolarDataset;
+import software.xdev.chartjs.model.dataset.RadarDataset;
+import software.xdev.chartjs.model.dataset.ScatterDataset;
+import software.xdev.chartjs.model.options.BarOptions;
+import software.xdev.chartjs.model.options.BubbleOptions;
+import software.xdev.chartjs.model.options.DoughnutOptions;
+import software.xdev.chartjs.model.options.LineOptions;
+import software.xdev.chartjs.model.options.Options;
+import software.xdev.chartjs.model.options.PieOptions;
+import software.xdev.chartjs.model.options.PolarOptions;
+import software.xdev.chartjs.model.options.RadarOptions;
+
+
+@SuppressWarnings("java:S2699") // Done in custom method
+class BasicChartTest extends AbstractChartTest
+{
+	@ParameterizedTest(name = "Check if basic {0} is displayed correctly")
+	@MethodSource
+	<O extends Options<?, ?>, D extends AbstractData<?, ?>> void basicTest(
+		final String chartName,
+		final Chart<?, O, D> chart,
+		final O options,
+		final D data)
+	{
+		options.setAnimation(false);
+		
+		chart.setOptions(options);
+		chart.setData(data);
+		
+		this.createScreenshotAndCompare(
+			chart,
+			this.getWebContainer(),
+			"Basic");
+	}
+	
+	static Stream<Arguments> basicTest()
+	{
+		final Map<String, BigDecimal> defaultData = IntStream.rangeClosed(0, 3)
+			.boxed()
+			.collect(Collectors.toMap(String::valueOf, BigDecimal::valueOf));
+		
+		return Stream.of(
+			new ArgumentDTO<>(
+				BarChart::new,
+				BarOptions::new,
+				createData(defaultData, BarData::new, BarDataset::new)),
+			new ArgumentDTO<>(
+				BubbleChart::new,
+				BubbleOptions::new,
+				createData(defaultData, BubbleData::new, BubbleDataset::new, entry -> new BubbleDataPoint(
+					entry.getValue(),
+					entry.getValue(),
+					entry.getValue().multiply(BigDecimal.TEN)))),
+			new ArgumentDTO<>(
+				DoughnutChart::new,
+				DoughnutOptions::new,
+				createData(defaultData, DoughnutData::new, DoughnutDataset::new)),
+			new ArgumentDTO<>(
+				LineChart::new,
+				LineOptions::new,
+				createData(defaultData, LineData::new, LineDataset::new)),
+			new ArgumentDTO<>(
+				PieChart::new,
+				PieOptions::new,
+				createData(defaultData, PieData::new, PieDataset::new)),
+			new ArgumentDTO<>(
+				PolarChart::new,
+				PolarOptions::new,
+				createData(defaultData, PolarData::new, PolarDataset::new)),
+			new ArgumentDTO<>(
+				RadarChart::new,
+				RadarOptions::new,
+				createData(defaultData, RadarData::new, RadarDataset::new)),
+			new ArgumentDTO<>(
+				ScatterChart::new,
+				LineOptions::new,
+				createData(
+					defaultData,
+					ScatterData::new,
+					ScatterDataset::new,
+					entry -> new ScatterDataPoint(entry.getValue(), entry.getValue()))),
+			new ArgumentDTO<>(
+				MixedChart::new,
+				LineOptions::new,
+				() -> new MixedData()
+					.addLabels("A", "B", "C")
+					.addDataset(new BarDataset()
+						.withDefaultType()
+						.setLabel("Dataset1")
+						.setData(1, 3, 2))
+					.addDataset(new LineDataset()
+						.withDefaultType()
+						.setLabel("Dataset2")
+						.setData(1, 2, 3))
+			)
+		).map(dto ->
+			Arguments.of(
+				dto.chartSupplier().get().getClass().getSimpleName(),
+				dto.chartSupplier().get(),
+				dto.optionsSupplier().get(),
+				dto.dataSupplier().get()));
+	}
+	
+	private static <D extends HomogeneousData<D, S>, S extends Dataset<S, Number>> Supplier<D> createData(
+		final Map<String, BigDecimal> defaultDataMap,
+		final Supplier<D> dataSupplier,
+		final Supplier<S> dataSetSupplier)
+	{
+		return createData(defaultDataMap, dataSupplier, dataSetSupplier, Map.Entry::getValue);
+	}
+	
+	private static <D extends HomogeneousData<D, S>, S extends Dataset<S, O>, O> Supplier<D> createData(
+		final Map<String, BigDecimal> defaultDataMap,
+		final Supplier<D> dataSupplier,
+		final Supplier<S> dataSetSupplier,
+		final Function<Map.Entry<String, BigDecimal>, O> addDataFunc)
+	{
+		return () -> {
+			final S dataset = dataSetSupplier.get();
+			final D data = dataSupplier.get().addDataset(dataset);
+			for(final Map.Entry<String, BigDecimal> entry : defaultDataMap.entrySet())
+			{
+				data.addLabel(entry.getKey());
+				dataset.addData(addDataFunc.apply(entry));
+			}
+			return data;
+		};
+	}
+	
+	public static class ArgumentDTO<O extends Options<?, ?>, D extends AbstractData<?, ?>>
+	{
+		private final Supplier<Chart<?, O, D>> chartSupplier;
+		private final Supplier<O> optionsSupplier;
+		private final Supplier<D> dataSupplier;
+		
+		public ArgumentDTO(
+			final Supplier<Chart<?, O, D>> chartSupplier,
+			final Supplier<O> optionsSupplier,
+			final Supplier<D> dataSupplier)
+		{
+			this.chartSupplier = chartSupplier;
+			this.optionsSupplier = optionsSupplier;
+			this.dataSupplier = dataSupplier;
+		}
+		
+		public Supplier<Chart<?, O, D>> chartSupplier()
+		{
+			return this.chartSupplier;
+		}
+		
+		public Supplier<O> optionsSupplier()
+		{
+			return this.optionsSupplier;
+		}
+		
+		public Supplier<D> dataSupplier()
+		{
+			return this.dataSupplier;
+		}
+	}
+}
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/ChartAxisFormatTest.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/ChartAxisFormatTest.java
new file mode 100644
index 0000000..fe69865
--- /dev/null
+++ b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/ChartAxisFormatTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model;
+
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+
+import software.xdev.chartjs.model.charts.BarChart;
+import software.xdev.chartjs.model.color.RGBAColor;
+import software.xdev.chartjs.model.data.BarData;
+import software.xdev.chartjs.model.dataset.BarDataset;
+import software.xdev.chartjs.model.javascript.JavaScriptFunction;
+import software.xdev.chartjs.model.options.BarOptions;
+import software.xdev.chartjs.model.options.scale.Scales;
+import software.xdev.chartjs.model.options.scale.cartesian.linear.LinearScaleOptions;
+import software.xdev.chartjs.model.options.scale.cartesian.linear.LinearTickOptions;
+
+
+@SuppressWarnings("java:S2699") // Done in custom method
+class ChartAxisFormatTest extends AbstractChartTest
+{
+	@Test
+	void axisTickCallback()
+	{
+		this.createScreenshotAndCompare(
+			new BarChart(data(), options(l -> l.setCallback(new JavaScriptFunction("(label) => `$${label}`")))),
+			this.getWebContainer(),
+			"AxisTickCallback");
+	}
+	
+	@Test
+	void format()
+	{
+		this.createScreenshotAndCompare(
+			new BarChart(data(), options(l -> l.setFormat(new CurrencyFormatOptions("currency", "USD")))),
+			this.getWebContainer(),
+			"Format");
+	}
+	
+	public static class CurrencyFormatOptions
+	{
+		private String style;
+		private String currency;
+		
+		public CurrencyFormatOptions()
+		{
+		}
+		
+		public CurrencyFormatOptions(final String style, final String currency)
+		{
+			this.style = style;
+			this.currency = currency;
+		}
+		
+		public String getStyle()
+		{
+			return this.style;
+		}
+		
+		public void setStyle(final String style)
+		{
+			this.style = style;
+		}
+		
+		public String getCurrency()
+		{
+			return this.currency;
+		}
+		
+		public void setCurrency(final String currency)
+		{
+			this.currency = currency;
+		}
+	}
+	
+	static BarData data()
+	{
+		final BarDataset dataset1 = new BarDataset()
+			.setData(65)
+			.addBackgroundColors(RGBAColor.RED);
+		
+		return new BarData()
+			.addLabels("First")
+			.addDataset(dataset1);
+	}
+	
+	static BarOptions options(final Consumer<LinearTickOptions> configureTickOptions)
+	{
+		final LinearTickOptions linearTickOptions = new LinearTickOptions();
+		configureTickOptions.accept(linearTickOptions);
+		
+		final BarOptions options = new BarOptions().setAnimation(false);
+		options
+			.getScales()
+			.addScale(Scales.ScaleAxis.Y, new LinearScaleOptions()
+				.setTicks(linearTickOptions));
+		return options;
+	}
+}
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/RadialScaleTest.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/RadialScaleTest.java
new file mode 100644
index 0000000..07c6ee4
--- /dev/null
+++ b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/RadialScaleTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model;
+
+import org.junit.jupiter.api.Test;
+
+import software.xdev.chartjs.model.charts.RadarChart;
+import software.xdev.chartjs.model.data.RadarData;
+import software.xdev.chartjs.model.dataset.RadarDataset;
+import software.xdev.chartjs.model.options.RadarOptions;
+import software.xdev.chartjs.model.options.scale.GridLineConfiguration;
+import software.xdev.chartjs.model.options.scale.Scales;
+import software.xdev.chartjs.model.options.scale.radial.AngleLines;
+import software.xdev.chartjs.model.options.scale.radial.PointLabels;
+import software.xdev.chartjs.model.options.scale.radial.RadialLinearScaleOptions;
+import software.xdev.chartjs.model.options.scale.radial.RadialTickOptions;
+
+
+@SuppressWarnings("java:S2699") // Done in custom method
+class RadialScaleTest extends AbstractChartTest
+{
+	@Test
+	void testBasicRadialScale()
+	{
+		final RadarDataset dataset1 = new RadarDataset()
+			.setLabel("A")
+			.setData(65, 59, 80)
+			.setBorderColor("blue")
+			.setBackgroundColor("rgba(0, 0, 255, 0.2)");
+		
+		final RadarDataset dataset2 = new RadarDataset()
+			.setLabel("B")
+			.setData(28, 45, 10)
+			.setBorderColor("gray");
+		
+		final RadarData data = new RadarData()
+			.addLabels("First", "Second", "Third")
+			.addDataset(dataset1)
+			.addDataset(dataset2);
+		
+		final RadarOptions options = new RadarOptions()
+			.setAnimation(false);
+		options
+			.getScales()
+			.addScale(Scales.ScaleAxis.R, new RadialLinearScaleOptions()
+				.setMin(0)
+				.setAngleLines(new AngleLines().setColor("red"))
+				.setGrid(new GridLineConfiguration().setColor("red"))
+				.setPointLabels(new PointLabels().setColor("red"))
+				.setTicks(new RadialTickOptions().setColor("red")));
+		
+		this.createScreenshotAndCompare(
+			new RadarChart(data, options),
+			this.getWebContainer(),
+			"BasicRadialScale"
+		);
+	}
+}
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/container/SeleniumBrowserWebDriverContainer.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/container/SeleniumBrowserWebDriverContainer.java
new file mode 100644
index 0000000..12ce5d2
--- /dev/null
+++ b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/container/SeleniumBrowserWebDriverContainer.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.container;
+
+import java.util.concurrent.TimeUnit;
+
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.remote.RemoteWebDriver;
+import org.rnorth.ducttape.timeouts.Timeouts;
+import org.rnorth.ducttape.unreliables.Unreliables;
+
+import software.xdev.testcontainers.selenium.containers.browser.CapabilitiesBrowserWebDriverContainer;
+
+
+public class SeleniumBrowserWebDriverContainer
+	extends CapabilitiesBrowserWebDriverContainer<SeleniumBrowserWebDriverContainer>
+{
+	protected RemoteWebDriver webDriver;
+	protected Capabilities capabilities;
+	
+	public SeleniumBrowserWebDriverContainer(final Capabilities capabilities)
+	{
+		super(capabilities);
+		this.capabilities = capabilities;
+	}
+	
+	public synchronized RemoteWebDriver webDriver()
+	{
+		if(this.webDriver == null)
+		{
+			this.webDriver = Unreliables.retryUntilSuccess(
+				2,
+				() -> Timeouts.getWithTimeout(
+					20,
+					TimeUnit.SECONDS,
+					() -> new RemoteWebDriver(this.getSeleniumAddressURI().toURL(), this.capabilities, false)
+				)
+			);
+		}
+		
+		return this.webDriver;
+	}
+}
diff --git a/chartjs-java-model/src/test/resources/log4j2-test.xml b/chartjs-java-model/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..eb5bcc0
--- /dev/null
+++ b/chartjs-java-model/src/test/resources/log4j2-test.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configuration>
+<Configuration status="ERROR">
+
+    <Properties>
+        <Property name="consolePattern">%d{HH:mm:ss} %-5p [%t] [%-25.25c] %m %n</Property>
+    </Properties>
+
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="${consolePattern}" />
+        </Console>
+    </Appenders>
+
+    <Loggers>
+        <Root level="INFO">
+            <AppenderRef ref="stdout"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartAxisTickCallback.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartAxisTickCallback.png
new file mode 100644
index 0000000..b91cad3
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartAxisTickCallback.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartBasic.png
new file mode 100644
index 0000000..881cac6
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartFormat.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartFormat.png
new file mode 100644
index 0000000..416cae3
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartFormat.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartScale.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartScale.png
new file mode 100644
index 0000000..595e543
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartScale.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStacked.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStacked.png
new file mode 100644
index 0000000..a579d81
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStacked.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStackedHorizontal.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStackedHorizontal.png
new file mode 100644
index 0000000..2ad029c
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStackedHorizontal.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStackedWithGroups.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStackedWithGroups.png
new file mode 100644
index 0000000..730e3e3
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartStackedWithGroups.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BarChartTicked.png b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartTicked.png
new file mode 100644
index 0000000..0c45378
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BarChartTicked.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/BubbleChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/BubbleChartBasic.png
new file mode 100644
index 0000000..8cd07c6
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/BubbleChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png
new file mode 100644
index 0000000..47bc7ca
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/LineChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/LineChartBasic.png
new file mode 100644
index 0000000..39d044d
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/LineChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/MixedChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/MixedChartBasic.png
new file mode 100644
index 0000000..44c7e67
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/MixedChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png
new file mode 100644
index 0000000..b652b60
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png
new file mode 100644
index 0000000..365317a
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png
new file mode 100644
index 0000000..7be178d
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png
new file mode 100644
index 0000000..b45aa91
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png differ
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/ScatterChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/ScatterChartBasic.png
new file mode 100644
index 0000000..c5cc1c3
Binary files /dev/null and b/chartjs-java-model/src/test/resources/screenshotReferences/ScatterChartBasic.png differ
diff --git a/chartjs-java-model/src/test/resources/test-template.html b/chartjs-java-model/src/test/resources/test-template.html
new file mode 100644
index 0000000..9aa08cd
--- /dev/null
+++ b/chartjs-java-model/src/test/resources/test-template.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.6/dist/chart.umd.js"></script>
+</head>
+<body>
+    <canvas id='c' style='border:1px solid #555;'></canvas>
+</body>
+</html>
diff --git a/pom.xml b/pom.xml
index eede261..138c843 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>template-placeholder-root</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>chartjs-java-model-root</artifactId>
+	<version>2.6.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -15,8 +15,8 @@
 	</organization>
 
 	<modules>
-		<module>template-placeholder</module>
-		<module>template-placeholder-demo</module>
+		<module>chartjs-java-model</module>
+		<module>chartjs-java-model-demo</module>
 	</modules>
 
 	<properties>
diff --git a/renovate.json5 b/renovate.json5
index 2874d45..e61b87c 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -4,7 +4,7 @@
   "packageRules": [
     {
       "description": "Ignore project internal dependencies",
-      "packagePattern": "^software.xdev:template-placeholder",
+      "packagePattern": "^software.xdev:chartjs-java-model",
       "datasources": [
         "maven"
       ],