diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7dd68ba0f29..5ea14527a3a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 Please consider the following before submitting a pull request:
 
-Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md
+Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/docs/developers/contributing.md
 
 Example of changes on an interactive website such as the following:
 - https://jsbin.com/
diff --git a/.gitignore b/.gitignore
index e941ca2d84c..3adb827bd0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 /custom
 /dist
 /gh-pages
-/helpers
 
 # Node.js
 node_modules/
diff --git a/docs/docs/axes/cartesian/time.md b/docs/docs/axes/cartesian/time.md
index 6fb5d1a36e7..43438bae1d2 100644
--- a/docs/docs/axes/cartesian/time.md
+++ b/docs/docs/axes/cartesian/time.md
@@ -28,7 +28,7 @@ The following options are provided by the time scale. You may also set options p
 | `bounds` | `string` | `'data'` | Determines the scale bounds. [more...](#scale-bounds)
 | `ticks.source` | `string` | `'auto'` | How ticks are generated. [more...](#ticks-source)
 | `time.displayFormats` | `object` | | Sets how different time units are displayed. [more...](#display-formats)
-| `time.isoWeekday` | `boolean` | `false` | If true and the unit is set to 'week', then the first day of the week will be Monday. Otherwise, it will be Sunday.
+| `time.isoWeekday` | `boolean`\|`number` | `false` | If `boolean` and true and the unit is set to 'week', then the first day of the week will be Monday. Otherwise, it will be Sunday. If `number`, the index of the first day of the week (0 - Sunday, 6 - Saturday)
 | `time.parser` | `string`\|`function` | | Custom parser for dates. [more...](#parser)
 | `time.round` | `string` | `false` | If defined, dates will be rounded to the start of this unit. See [Time Units](#time-units) below for the allowed units.
 | `time.tooltipFormat` | `string` | | The format string to use for the tooltip.
diff --git a/docs/docs/developers/charts.md b/docs/docs/developers/charts.md
index 385132b8ea5..dfe8939dd0a 100644
--- a/docs/docs/developers/charts.md
+++ b/docs/docs/developers/charts.md
@@ -150,3 +150,28 @@ new Chart(ctx, {
     options: options
 });
 ```
+
+## TypeScript Typings
+
+If you want your new chart type to be statically typed, you must provide a `.d.ts` TypeScript declaration file. Chart.js provides a way to augment built-in types with user-defined ones, by using the concept of "declaration merging".
+
+There are three main declarations that can be augmented when adding a new chart type:
+
+* `ChartTypeEnum` enumeration must contain an entry for the new type.
+* `IChartTypeRegistry` must contains the declarations for the new type, either by extending an existing entry in `IChartTypeRegistry` or by creating a new one.
+
+For example, to provide typings for a new chart type that extends from a bubble chart, you would add a `.d.ts` containing:
+
+```javascript
+import { IChartTypeRegistry } from 'chart.js'
+
+declare module 'chart.js' {
+    enum ChartTypeEnum {
+        derivedBubble = 'derivedBubble'
+    }
+
+    interface IChartTypeRegistry {
+        derivedBubble: IChartTypeRegistry['bubble']
+    }
+}
+```
diff --git a/docs/docs/developers/plugins.md b/docs/docs/developers/plugins.md
index 19bda89d19d..0e4bb33163e 100644
--- a/docs/docs/developers/plugins.md
+++ b/docs/docs/developers/plugins.md
@@ -43,7 +43,7 @@ However, this approach is not ideal when the customization needs to apply to man
 Plugins can be registered globally to be applied on all charts (a.k.a. *global plugins*):
 
 ```javascript
-Chart.plugins.register({
+Chart.register({
     // plugin implementation
 });
 ```
@@ -92,7 +92,7 @@ var chart = new Chart(ctx, {
 To disable a global plugin for a specific chart instance, the plugin options must be set to `false`:
 
 ```javascript
-Chart.plugins.register({
+Chart.register({
     id: 'p1',
     // ...
 });
@@ -106,6 +106,6 @@ var chart = new Chart(ctx, {
 });
 ```
 
- ## Plugin Core API
+## Plugin Core API
 
 Read more about the [existing plugin extension hooks](../jsdoc/IPlugin.html).
diff --git a/docs/docs/developers/publishing.md b/docs/docs/developers/publishing.md
index 6c419f87915..497f2c92aff 100644
--- a/docs/docs/developers/publishing.md
+++ b/docs/docs/developers/publishing.md
@@ -20,12 +20,19 @@ But not the helpers.
 
 In UMD, helpers are available through `Chart.helpers`. In ESM, they are imported from `chart.js/helpers`.
 
-There are multiple namespaces under helpers. Some of the namespaces are bundled directly under `Chart.helpers` for backward compatibility, those are: `core`, `color` and `extras`.
-
-For example `import {isNullOrUndef} from 'chart.js/helpers/core'` is available at `Chart.helpers.isNullOrUndef` for UMD.
+For example `import {isNullOrUndef} from 'chart.js/helpers'` is available at `Chart.helpers.isNullOrUndef` for UMD.
 
 ### Rollup
 
 `output.globals` can be used to convert the helpers.
 
-For convinience, a plugin is available for the configuration: [rollup-plugin-chartjs-globals](https://www.npmjs.com/package/rollup-plugin-chartjs-globals).
+```js
+{
+    output: {
+        globals: {
+            'chart.js': 'Chart',
+            'chart.js/helpers': 'Chart.helpers'
+        }
+    }
+}
+```
diff --git a/docs/docs/getting-started/v3-migration.md b/docs/docs/getting-started/v3-migration.md
index 15ffddc0a12..09a3dd11875 100644
--- a/docs/docs/getting-started/v3-migration.md
+++ b/docs/docs/getting-started/v3-migration.md
@@ -263,6 +263,7 @@ The following properties and methods were removed:
 * `Chart.offsetY`
 * `Chart.outerRadius` now lives on doughnut, pie, and polarArea controllers
 * `Chart.plugins` was replaced with `Chart.registry`. Plugin defaults are now in `Chart.defaults.plugins[id]`.
+* `Chart.plugins.register` was replaced by `Chart.register`.
 * `Chart.PolarArea`. New charts are created via `new Chart` and providing the appropriate `type` parameter
 * `Chart.prototype.generateLegend`
 * `Chart.platform`. It only contained `disableCSSInjection`. CSS is never injected in v3.
@@ -305,9 +306,9 @@ The following properties and methods were removed:
 * `helpers.getValueAtIndexOrDefault`. Use `helpers.resolve` instead.
 * `helpers.indexOf`
 * `helpers.lineTo`
-* `helpers.longestText` was moved to the `helpers.canvas` namespace and made private
+* `helpers.longestText` was made private
 * `helpers.max`
-* `helpers.measureText` was moved to the `helpers.canvas` namespace and made private
+* `helpers.measureText` was made private
 * `helpers.min`
 * `helpers.nextItem`
 * `helpers.niceNum`
@@ -368,31 +369,12 @@ The following properties were renamed during v3 development:
 
 * `Chart.Animation.animationObject` was renamed to `Chart.Animation`
 * `Chart.Animation.chartInstance` was renamed to `Chart.Animation.chart`
-* `Chart.canvasHelpers` was renamed to `Chart.helpers.canvas`
+* `Chart.canvasHelpers` was merged with `Chart.helpers`
 * `Chart.layoutService` was renamed to `Chart.layouts`
 * `Chart.pluginService` was renamed to `Chart.plugins`
-* `helpers._decimalPlaces` was renamed to `helpers.math._decimalPlaces`
-* `helpers.almostEquals` was renamed to `helpers.math.almostEquals`
-* `helpers.almostWhole` was renamed to `helpers.math.almostWhole`
 * `helpers.callCallback` was renamed to `helpers.callback`
-* `helpers.clear` was renamed to `helpers.canvas.clear`
-* `helpers.distanceBetweenPoints` was renamed to `helpers.math.distanceBetweenPoints`
-* `helpers.drawRoundedRectangle` was renamed to `helpers.canvas.roundedRect`
-* `helpers.getAngleFromPoint` was renamed to `helpers.math.getAngleFromPoint`
-* `helpers.getMaximumHeight` was renamed to `helpers.dom.getMaximumHeight`
-* `helpers.getMaximumWidth` was renamed to `helpers.dom.getMaximumWidth`
-* `helpers.getRelativePosition` was renamed to `helpers.dom.getRelativePosition`
-* `helpers.getStyle` was renamed to `helpers.dom.getStyle`
+* `helpers.drawRoundedRectangle` was renamed to `helpers.roundedRect`
 * `helpers.getValueOrDefault` was renamed to `helpers.valueOrDefault`
-* `helpers.easingEffects` was renamed to `helpers.easing.effects`
-* `helpers.log10` was renamed to `helpers.math.log10`
-* `helpers.isNumber` was renamed to `helpers.math.isNumber`
-* `helpers.sign` was renamed to `helpers.math.sign`
-* `helpers.retinaScale` was renamed to `helpers.dom.retinaScale`
-* `helpers.splineCurve` was renamed to `helpers.curve.splineCurve`
-* `helpers.splineCurveMonotone` was renamed to `helpers.curve.splineCurveMonotone`
-* `helpers.toDegrees` was renamed to `helpers.math.toDegrees`
-* `helpers.toRadians` was renamed to `helpers.math.toRadians`
 * `Scale.calculateTickRotation` was renamed to `Scale.calculateLabelRotation`
 * `Tooltip.options.legendColorBackgroupd` was renamed to `Tooltip.options.multiKeyBackground`
 
@@ -427,8 +409,6 @@ The private APIs listed below were renamed:
 * `DatasetController.resyncElements` was renamed to `DatasetController._resyncElements`
 * `RadialLinearScale.setReductions` was renamed to `RadialLinearScale._setReductions`
 * `Scale.handleMargins` was renamed to `Scale._handleMargins`
-* `helpers._alignPixel` was renamed to `helpers.canvas._alignPixel`
-* `helpers._decimalPlaces` was renamed to `helpers.math._decimalPlaces`
 
 ### Changed
 
@@ -460,7 +440,7 @@ The APIs listed in this section have changed in signature or behaviour from vers
 
 ##### Dataset Controllers
 
-* `updateElement` was replaced with `updateElements` now taking the elements to update, the `start` index, and `mode`
+* `updateElement` was replaced with `updateElements` now taking the elements to update, the `start` index, `count`, and `mode`
 * `setHoverStyle` and `removeHoverStyle` now additionally take the `datasetIndex` and `index`
 
 #### Interactions
@@ -473,9 +453,13 @@ The APIs listed in this section have changed in signature or behaviour from vers
 
 #### Helpers
 
+All helpers are now exposed in a flat hierarchy, e.g., `Chart.helpers.canvas.clipArea` -> `Chart.helpers.clipArea`
+
 ##### Canvas Helper
 
 * The second parameter to `drawPoint` is now the full options object, so `style`, `rotation`, and `radius` are no longer passed explicitly
+* `helpers.getMaximumHeight` was replaced by `helpers.dom.getMaximumSize`
+* `helpers.getMaximumWidth` was replaced by `helpers.dom.getMaximumSize`
 
 #### Platform
 
diff --git a/helpers/helpers.esm.d.ts b/helpers/helpers.esm.d.ts
new file mode 100644
index 00000000000..72eaf0f1ed6
--- /dev/null
+++ b/helpers/helpers.esm.d.ts
@@ -0,0 +1 @@
+export * from '../dist/helpers.esm';
\ No newline at end of file
diff --git a/helpers/helpers.esm.js b/helpers/helpers.esm.js
new file mode 100644
index 00000000000..72eaf0f1ed6
--- /dev/null
+++ b/helpers/helpers.esm.js
@@ -0,0 +1 @@
+export * from '../dist/helpers.esm';
\ No newline at end of file
diff --git a/helpers/helpers.js b/helpers/helpers.js
new file mode 100644
index 00000000000..09ec34b1dd6
--- /dev/null
+++ b/helpers/helpers.js
@@ -0,0 +1 @@
+module.exports = require('..').helpers;
\ No newline at end of file
diff --git a/helpers/package.json b/helpers/package.json
new file mode 100644
index 00000000000..d97b75cbfba
--- /dev/null
+++ b/helpers/package.json
@@ -0,0 +1,8 @@
+{
+    "name": "chart.js-helpers",
+    "private": true,
+    "description": "helper package",
+    "main": "helpers.js",
+    "module": "helpers.esm.js",
+    "types": "helpers.esm.d.ts"
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index a79eda655ba..c976d73e583 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "chart.js",
-  "version": "3.0.0-beta",
+  "version": "3.0.0-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -25,19 +25,19 @@
       }
     },
     "@babel/core": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz",
-      "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==",
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
+      "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.0",
+        "@babel/generator": "^7.11.6",
         "@babel/helper-module-transforms": "^7.11.0",
         "@babel/helpers": "^7.10.4",
-        "@babel/parser": "^7.11.1",
+        "@babel/parser": "^7.11.5",
         "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.11.0",
-        "@babel/types": "^7.11.0",
+        "@babel/traverse": "^7.11.5",
+        "@babel/types": "^7.11.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
@@ -75,9 +75,9 @@
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -88,12 +88,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-      "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+      "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0",
+        "@babel/types": "^7.11.5",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -105,9 +105,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -133,9 +133,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -162,9 +162,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -238,9 +238,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -251,12 +251,11 @@
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
-      "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.10.4",
         "@babel/types": "^7.10.4"
       },
       "dependencies": {
@@ -267,9 +266,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -297,9 +296,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -325,9 +324,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -353,9 +352,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -381,9 +380,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -433,9 +432,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -461,9 +460,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -489,15 +488,14 @@
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-wrap-function": "^7.10.4",
         "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
         "@babel/types": "^7.10.4"
       },
       "dependencies": {
@@ -508,9 +506,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -539,9 +537,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -568,9 +566,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -596,9 +594,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -624,9 +622,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -661,9 +659,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -691,9 +689,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -715,9 +713,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.11.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-      "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
@@ -1147,9 +1145,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -1696,9 +1694,9 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz",
-      "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
+      "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.11.0",
@@ -1763,7 +1761,7 @@
         "@babel/plugin-transform-unicode-escapes": "^7.10.4",
         "@babel/plugin-transform-unicode-regex": "^7.10.4",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.11.0",
+        "@babel/types": "^7.11.5",
         "browserslist": "^4.12.0",
         "core-js-compat": "^3.6.2",
         "invariant": "^2.2.2",
@@ -1793,9 +1791,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -1806,9 +1804,9 @@
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -1865,9 +1863,9 @@
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -1878,17 +1876,17 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-      "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.0",
+        "@babel/generator": "^7.11.5",
         "@babel/helper-function-name": "^7.10.4",
         "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.11.0",
-        "@babel/types": "^7.11.0",
+        "@babel/parser": "^7.11.5",
+        "@babel/types": "^7.11.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.19"
@@ -1921,9 +1919,9 @@
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -1944,6 +1942,53 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@eslint/eslintrc": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz",
+      "integrity": "sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "lodash": "^4.17.19",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+          "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "globals": {
+          "version": "12.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.8.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        }
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -3381,9 +3426,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001114",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001114.tgz",
-      "integrity": "sha512-ml/zTsfNBM+T1+mjglWRPgVsu2L76GAaADKX5f4t0pbhttEp0WMawJsHDYlFkVZkoA+89uvBRrVrEE4oqenzXQ==",
+      "version": "1.0.30001124",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz",
+      "integrity": "sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA==",
       "dev": true
     },
     "caseless": {
@@ -4001,9 +4046,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.533",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.533.tgz",
-      "integrity": "sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A==",
+      "version": "1.3.562",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.562.tgz",
+      "integrity": "sha512-WhRe6liQ2q/w1MZc8mD8INkenHivuHdrr4r5EQHNomy3NJux+incP6M6lDMd0paShP3MD0WGe5R1TWmEClf+Bg==",
       "dev": true
     },
     "emoji-regex": {
@@ -4154,12 +4199,13 @@
       "dev": true
     },
     "eslint": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz",
-      "integrity": "sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz",
+      "integrity": "sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
+        "@eslint/eslintrc": "^0.1.3",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -4169,7 +4215,7 @@
         "eslint-scope": "^5.1.0",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^1.3.0",
-        "espree": "^7.2.0",
+        "espree": "^7.3.0",
         "esquery": "^1.2.0",
         "esutils": "^2.0.2",
         "file-entry-cache": "^5.0.1",
@@ -4285,9 +4331,9 @@
           }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -4657,12 +4703,12 @@
       "dev": true
     },
     "espree": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz",
-      "integrity": "sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz",
+      "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==",
       "dev": true,
       "requires": {
-        "acorn": "^7.3.1",
+        "acorn": "^7.4.0",
         "acorn-jsx": "^5.2.0",
         "eslint-visitor-keys": "^1.3.0"
       },
@@ -4732,9 +4778,9 @@
       "dev": true
     },
     "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
       "dev": true
     },
     "expand-brackets": {
@@ -5933,9 +5979,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -6043,24 +6089,23 @@
       }
     },
     "karma": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-5.1.1.tgz",
-      "integrity": "sha512-xAlOr5PMqUbiKXSv5PCniHWV3aiwj6wIZ0gUVcwpTCPVQm/qH2WAMFWxtnpM6KJqhkRWrIpovR4Rb0rn8GtJzQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-5.2.1.tgz",
+      "integrity": "sha512-+/AO2fWL7kC3aWTx/lHjtKXfOqh0O+KLtTy4BLQ/b/eciHR4VTHHdPhdrn9sDBQskgDieaBZ+sAKzlldc4GW/Q==",
       "dev": true,
       "requires": {
         "body-parser": "^1.19.0",
         "braces": "^3.0.2",
-        "chokidar": "^3.0.0",
+        "chokidar": "^3.4.2",
         "colors": "^1.4.0",
         "connect": "^3.7.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.1",
-        "flatted": "^2.0.2",
         "glob": "^7.1.6",
         "graceful-fs": "^4.2.4",
         "http-proxy": "^1.18.1",
         "isbinaryfile": "^4.0.6",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "log4js": "^6.2.1",
         "mime": "^2.4.5",
         "minimatch": "^3.0.4",
@@ -6068,12 +6113,28 @@
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
         "socket.io": "^2.3.0",
-        "source-map": "^0.6.1",
+        "source-map": "^0.7.3",
         "tmp": "0.2.1",
         "ua-parser-js": "0.7.21",
         "yargs": "^15.3.1"
       },
       "dependencies": {
+        "chokidar": {
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+          "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.2",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.4.0"
+          }
+        },
         "rimraf": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -6084,9 +6145,9 @@
           }
         },
         "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
         },
         "tmp": {
@@ -6297,9 +6358,9 @@
       }
     },
     "lunr": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz",
-      "integrity": "sha512-oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg==",
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
+      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
       "dev": true
     },
     "magic-string": {
@@ -6351,7 +6412,7 @@
     },
     "media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
@@ -6769,7 +6830,7 @@
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
@@ -7280,9 +7341,9 @@
       }
     },
     "rollup": {
-      "version": "2.25.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.25.0.tgz",
-      "integrity": "sha512-S+OzytEaqcLugXAqesmJMb1Q16I6h1ps8F3AOX7yMZ1OkkuOATJH/x2lqJJtjQo2/d+0J4j62M2RbvgmxvOuCw==",
+      "version": "2.26.10",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.26.10.tgz",
+      "integrity": "sha512-dUnjCWOA0h9qNX6qtcHidyatz8FAFZxVxt1dbcGtKdlJkpSxGK3G9+DLCYvtZr9v94D129ij9zUhG+xbRoqepw==",
       "dev": true,
       "requires": {
         "fsevents": "~2.1.2"
@@ -7309,9 +7370,9 @@
       }
     },
     "rollup-plugin-dts": {
-      "version": "1.4.10",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-1.4.10.tgz",
-      "integrity": "sha512-bL6MBXc8lK7D5b/tYbHaglxs4ZxMQTQilGA6Xm9KQBEj4h9ZwIDlAsvDooGjJ/cOw23r3POTRtSCEyTHxtzHJg==",
+      "version": "1.4.12",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-1.4.12.tgz",
+      "integrity": "sha512-1TIHkYbxXkwsqW/l//CuBu7Kc4oriCe7XEzFr5wHMAeRtgxSMjaNWiyB/4n7Tgv6NHe/Z1R4GJiualXTO4cc/A==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4"
@@ -7349,9 +7410,9 @@
       }
     },
     "rollup-plugin-terser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.0.tgz",
-      "integrity": "sha512-p/N3lLiFusCjYTLfVkoaiRTOGr5AESEaljMPH12MhOtoMkmTBhIAfuadrcWy4am1U0vU4WTxO9fi0K09O4CboQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.1.tgz",
+      "integrity": "sha512-HL0dgzSxBYG/Ly9i/E5Sc+PuKKZ0zBzk11VmLCfdUtpqH4yYqkLclPkTqRy85FU9246yetImOClaQ/ufnj08vg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
@@ -7869,7 +7930,7 @@
     },
     "sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
@@ -8049,9 +8110,9 @@
       }
     },
     "terser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.0.0.tgz",
-      "integrity": "sha512-olH2DwGINoSuEpSGd+BsPuAQaA3OrHnHnFL/rDB2TVNc3srUbz/rq/j2BlF4zDXI+JqAvGr86bIm1R2cJgZ3FA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.0.tgz",
+      "integrity": "sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -8086,7 +8147,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
@@ -8221,21 +8282,21 @@
       }
     },
     "typedoc": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.18.0.tgz",
-      "integrity": "sha512-UgDQwapCGQCCdYhEQzQ+kGutmcedklilgUGf62Vw6RdI29u6FcfAXFQfRTiJEbf16aK3YnkB20ctQK1JusCRbA==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.19.0.tgz",
+      "integrity": "sha512-Rn68JwgDDYyIWl3HXeSsLZcsvxd2anISjhKu64PvID7RETeS2Iwnc4cH60yqc8/N50Xo1d3MHPGYinCPhMMliQ==",
       "dev": true,
       "requires": {
         "fs-extra": "^9.0.1",
         "handlebars": "^4.7.6",
         "highlight.js": "^10.0.0",
-        "lodash": "^4.17.15",
-        "lunr": "^2.3.8",
+        "lodash": "^4.17.20",
+        "lunr": "^2.3.9",
         "marked": "^1.1.1",
         "minimatch": "^3.0.0",
         "progress": "^2.0.3",
         "shelljs": "^0.8.4",
-        "typedoc-default-themes": "^0.10.2"
+        "typedoc-default-themes": "^0.11.1"
       },
       "dependencies": {
         "fs-extra": {
@@ -8260,6 +8321,12 @@
             "universalify": "^1.0.0"
           }
         },
+        "lodash": {
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "dev": true
+        },
         "universalify": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
@@ -8269,18 +8336,18 @@
       }
     },
     "typedoc-default-themes": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.10.2.tgz",
-      "integrity": "sha512-zo09yRj+xwLFE3hyhJeVHWRSPuKEIAsFK5r2u47KL/HBKqpwdUSanoaz5L34IKiSATFrjG5ywmIu98hPVMfxZg==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.1.tgz",
+      "integrity": "sha512-1yl8pbhjrLywqGJx9TfT+wzP+ntudPYjgJdpCj+s5ed2etBkqZPOCBMKwpaN9o6pdoFQF195PggqWTLVEkaRQQ==",
       "dev": true,
       "requires": {
-        "lunr": "^2.3.8"
+        "lunr": "^2.3.9"
       }
     },
     "typescript": {
-      "version": "3.9.7",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz",
+      "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==",
       "dev": true
     },
     "ua-parser-js": {
@@ -8290,9 +8357,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz",
-      "integrity": "sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q==",
+      "version": "3.10.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.3.tgz",
+      "integrity": "sha512-Lh00i69Uf6G74mvYpHCI9KVVXLcHW/xu79YTvH7Mkc9zyKUeSPz0owW0dguj0Scavns3ZOh3wY63J0Zb97Za2g==",
       "dev": true,
       "optional": true
     },
diff --git a/package.json b/package.json
index 5fd50ee8575..cfa190ee7bc 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "chart.js",
   "homepage": "https://www.chartjs.org",
   "description": "Simple HTML5 charts using the canvas element.",
-  "version": "3.0.0-beta",
+  "version": "3.0.0-beta.2",
   "license": "MIT",
   "jsdelivr": "dist/chart.min.js",
   "unpkg": "dist/chart.min.js",
@@ -42,9 +42,9 @@
     "typedoc": "npx typedoc"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.1",
+    "@babel/core": "^7.11.6",
     "@babel/plugin-transform-object-assign": "^7.10.4",
-    "@babel/preset-env": "^7.11.0",
+    "@babel/preset-env": "^7.11.5",
     "@kurkle/color": "^0.1.9",
     "@rollup/plugin-commonjs": "^15.0.0",
     "@rollup/plugin-inject": "^4.0.2",
@@ -56,14 +56,14 @@
     "concurrently": "^5.3.0",
     "coveralls": "^3.1.0",
     "cross-env": "^7.0.2",
-    "eslint": "^7.6.0",
+    "eslint": "^7.8.1",
     "eslint-config-chartjs": "^0.2.0",
     "eslint-config-esnext": "^4.1.0",
     "eslint-plugin-html": "^6.0.3",
     "glob": "^7.1.6",
     "jasmine": "^3.6.1",
     "jasmine-core": "^3.6.0",
-    "karma": "^5.1.1",
+    "karma": "^5.2.1",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.0.3",
     "karma-edge-launcher": "^0.4.2",
@@ -76,13 +76,13 @@
     "pixelmatch": "^5.2.1",
     "promise-polyfill": "^8.1.3",
     "resize-observer-polyfill": "^1.5.1",
-    "rollup": "^2.25.0",
+    "rollup": "^2.26.10",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-cleanup": "^3.1.1",
-    "rollup-plugin-dts": "^1.4.10",
-    "rollup-plugin-terser": "^7.0.0",
-    "typedoc": "^0.18.0",
-    "typescript": "^3.9.7",
+    "rollup-plugin-dts": "^1.4.12",
+    "rollup-plugin-terser": "^7.0.1",
+    "typedoc": "^0.19.0",
+    "typescript": "^4.0.2",
     "yargs": "^15.4.1"
   },
   "dependencies": {}
diff --git a/rollup.config.js b/rollup.config.js
index f30161bc151..8697a950084 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -4,7 +4,6 @@
 const babel = require('rollup-plugin-babel');
 const cleanup = require('rollup-plugin-cleanup');
 const dts = require('rollup-plugin-dts').default;
-const glob = require('glob');
 const inject = require('@rollup/plugin-inject');
 const json = require('@rollup/plugin-json');
 const resolve = require('@rollup/plugin-node-resolve').default;
@@ -14,16 +13,12 @@ const pkg = require('./package.json');
 const input = 'src/index.js';
 const inputESM = {
 	'dist/chart.esm': 'src/index.esm.js',
+	'dist/helpers.esm': 'src/helpers/index.js'
+};
+const inputESMTypings = {
+	'dist/chart.esm': 'types/index.esm.d.ts',
+	'dist/helpers.esm': 'types/helpers/index.d.ts'
 };
-const inputESMTypings = {};
-glob('src/helpers/helpers.*.js', (_er, files) => {
-	files.forEach(file => {
-		inputESM[file.replace(/src\/|helpers\.|\.js/g, '')] = file;
-	});
-	Object.keys(inputESM).forEach((key) => {
-		inputESMTypings[key.replace('src', 'types')] = inputESM[key].replace('src', 'types').replace(/\.js$/, '.d.ts');
-	});
-});
 
 const banner = `/*!
  * Chart.js v${pkg.version}
@@ -96,7 +91,7 @@ module.exports = [
 		],
 		output: {
 			dir: './',
-			chunkFileNames: 'helpers/chunks/[name].js',
+			chunkFileNames: 'dist/chunks/[name].js',
 			banner,
 			format: 'esm',
 			indent: false,
@@ -112,7 +107,7 @@ module.exports = [
 		],
 		output: {
 			dir: './',
-			chunkFileNames: 'helpers/chunks/[name].ts',
+			chunkFileNames: 'dist/chunks/[name].ts',
 			banner,
 			format: 'esm',
 			indent: false,
diff --git a/samples/charts/area/analyser.js b/samples/charts/area/analyser.js
index b2db9ab525f..5c100541830 100644
--- a/samples/charts/area/analyser.js
+++ b/samples/charts/area/analyser.js
@@ -1,7 +1,7 @@
 'use strict';
 
 (function() {
-	Chart.plugins.register({
+	Chart.register({
 		id: 'samples-filler-analyser',
 
 		beforeInit: function(chart, options) {
diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 0e663c983c7..30e092d8901 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -231,10 +231,10 @@ export default class BarController extends DatasetController {
 		const me = this;
 		const meta = me._cachedMeta;
 
-		me.updateElements(meta.data, 0, mode);
+		me.updateElements(meta.data, 0, meta.data.length, mode);
 	}
 
-	updateElements(rectangles, start, mode) {
+	updateElements(rectangles, start, count, mode) {
 		const me = this;
 		const reset = mode === 'reset';
 		const vscale = me._cachedMeta.vScale;
@@ -247,11 +247,10 @@ export default class BarController extends DatasetController {
 
 		me.updateSharedOptions(sharedOptions, mode, firstOpts);
 
-		for (let i = 0; i < rectangles.length; i++) {
-			const index = start + i;
-			const options = sharedOptions || me.resolveDataElementOptions(index, mode);
-			const vpixels = me._calculateBarValuePixels(index, options);
-			const ipixels = me._calculateBarIndexPixels(index, ruler, options);
+		for (let i = start; i < start + count; i++) {
+			const options = sharedOptions || me.resolveDataElementOptions(i, mode);
+			const vpixels = me._calculateBarValuePixels(i, options);
+			const ipixels = me._calculateBarIndexPixels(i, ruler, options);
 
 			const properties = {
 				horizontal,
@@ -265,7 +264,7 @@ export default class BarController extends DatasetController {
 			if (includeOptions) {
 				properties.options = options;
 			}
-			me.updateElement(rectangles[i], index, properties, mode);
+			me.updateElement(rectangles[i], i, properties, mode);
 		}
 	}
 
diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 386317b10a0..c0aceecd095 100644
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -65,10 +65,10 @@ export default class BubbleController extends DatasetController {
 		const points = me._cachedMeta.data;
 
 		// Update Points
-		me.updateElements(points, 0, mode);
+		me.updateElements(points, 0, points.length, mode);
 	}
 
-	updateElements(points, start, mode) {
+	updateElements(points, start, count, mode) {
 		const me = this;
 		const reset = mode === 'reset';
 		const {xScale, yScale} = me._cachedMeta;
@@ -76,10 +76,9 @@ export default class BubbleController extends DatasetController {
 		const sharedOptions = me.getSharedOptions(firstOpts);
 		const includeOptions = me.includeOptions(mode, sharedOptions);
 
-		for (let i = 0; i < points.length; i++) {
+		for (let i = start; i < start + count; i++) {
 			const point = points[i];
-			const index = start + i;
-			const parsed = !reset && me.getParsed(index);
+			const parsed = !reset && me.getParsed(i);
 			const x = reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(parsed.x);
 			const y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(parsed.y);
 			const properties = {
@@ -89,14 +88,14 @@ export default class BubbleController extends DatasetController {
 			};
 
 			if (includeOptions) {
-				properties.options = me.resolveDataElementOptions(index, mode);
+				properties.options = me.resolveDataElementOptions(i, mode);
 
 				if (reset) {
 					properties.options.radius = 0;
 				}
 			}
 
-			me.updateElement(point, index, properties, mode);
+			me.updateElement(point, i, properties, mode);
 		}
 
 		me.updateSharedOptions(sharedOptions, mode, firstOpts);
diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 78e79a4fe9f..389e4697900 100644
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -104,7 +104,7 @@ export default class DoughnutController extends DatasetController {
 		me.outerRadius = outerRadius - radiusLength * me._getRingWeightOffset(me.index);
 		me.innerRadius = Math.max(me.outerRadius - radiusLength * chartWeight, 0);
 
-		me.updateElements(arcs, 0, mode);
+		me.updateElements(arcs, 0, arcs.length, mode);
 	}
 
 	/**
@@ -117,7 +117,7 @@ export default class DoughnutController extends DatasetController {
 		return reset && opts.animation.animateRotate ? 0 : this.chart.getDataVisibility(i) ? me.calculateCircumference(meta._parsed[i] * opts.circumference / DOUBLE_PI) : 0;
 	}
 
-	updateElements(arcs, start, mode) {
+	updateElements(arcs, start, count, mode) {
 		const me = this;
 		const reset = mode === 'reset';
 		const chart = me.chart;
@@ -139,9 +139,8 @@ export default class DoughnutController extends DatasetController {
 			startAngle += me._circumference(i, reset);
 		}
 
-		for (i = 0; i < arcs.length; ++i) {
-			const index = start + i;
-			const circumference = me._circumference(index, reset);
+		for (i = start; i < start + count; ++i) {
+			const circumference = me._circumference(i, reset);
 			const arc = arcs[i];
 			const properties = {
 				x: centerX + me.offsetX,
@@ -153,11 +152,11 @@ export default class DoughnutController extends DatasetController {
 				innerRadius
 			};
 			if (includeOptions) {
-				properties.options = sharedOptions || me.resolveDataElementOptions(index, mode);
+				properties.options = sharedOptions || me.resolveDataElementOptions(i, mode);
 			}
 			startAngle += circumference;
 
-			me.updateElement(arc, index, properties, mode);
+			me.updateElement(arc, i, properties, mode);
 		}
 		me.updateSharedOptions(sharedOptions, mode, firstOpts);
 	}
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index fae5d17a143..669b602319f 100644
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -1,7 +1,8 @@
 import DatasetController from '../core/core.datasetController';
 import {valueOrDefault} from '../helpers/helpers.core';
-import {isNumber} from '../helpers/helpers.math';
+import {isNumber, _limitValue} from '../helpers/helpers.math';
 import {resolve} from '../helpers/helpers.options';
+import {_lookupByKey} from '../helpers/helpers.collection';
 
 export default class LineController extends DatasetController {
 
@@ -13,8 +14,18 @@ export default class LineController extends DatasetController {
 	update(mode) {
 		const me = this;
 		const meta = me._cachedMeta;
-		const line = meta.dataset;
-		const points = meta.data || [];
+		const {dataset: line, data: points = []} = meta;
+		// @ts-ignore
+		const animationsDisabled = me.chart._animationsDisabled;
+		let {start, count} = getStartAndCountOfVisiblePoints(meta, points, animationsDisabled);
+
+		me._drawStart = start;
+		me._drawCount = count;
+
+		if (scaleRangesChanged(meta) && !animationsDisabled) {
+			start = 0;
+			count = points.length;
+		}
 
 		// Update Line
 		// In resize mode only point locations change, so no need to set the points or options.
@@ -28,10 +39,10 @@ export default class LineController extends DatasetController {
 		}
 
 		// Update Points
-		me.updateElements(points, 0, mode);
+		me.updateElements(points, start, count, mode);
 	}
 
-	updateElements(points, start, mode) {
+	updateElements(points, start, count, mode) {
 		const me = this;
 		const reset = mode === 'reset';
 		const {xScale, yScale, _stacked} = me._cachedMeta;
@@ -40,14 +51,13 @@ export default class LineController extends DatasetController {
 		const includeOptions = me.includeOptions(mode, sharedOptions);
 		const spanGaps = valueOrDefault(me._config.spanGaps, me.chart.options.spanGaps);
 		const maxGapLength = isNumber(spanGaps) ? spanGaps : Number.POSITIVE_INFINITY;
-		let prevParsed;
+		let prevParsed = start > 0 && me.getParsed(start - 1);
 
-		for (let i = 0; i < points.length; ++i) {
-			const index = start + i;
+		for (let i = start; i < start + count; ++i) {
 			const point = points[i];
-			const parsed = me.getParsed(index);
-			const x = xScale.getPixelForValue(parsed.x, index);
-			const y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(_stacked ? me.applyStack(yScale, parsed) : parsed.y, index);
+			const parsed = me.getParsed(i);
+			const x = xScale.getPixelForValue(parsed.x, i);
+			const y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(_stacked ? me.applyStack(yScale, parsed) : parsed.y, i);
 			const properties = {
 				x,
 				y,
@@ -56,10 +66,10 @@ export default class LineController extends DatasetController {
 			};
 
 			if (includeOptions) {
-				properties.options = sharedOptions || me.resolveDataElementOptions(index, mode);
+				properties.options = sharedOptions || me.resolveDataElementOptions(i, mode);
 			}
 
-			me.updateElement(point, index, properties, mode);
+			me.updateElement(point, i, properties, mode);
 
 			prevParsed = parsed;
 		}
@@ -167,3 +177,53 @@ LineController.defaults = {
 		},
 	}
 };
+
+function getStartAndCountOfVisiblePoints(meta, points, animationsDisabled) {
+	const pointCount = points.length;
+
+	let start = 0;
+	let count = pointCount;
+
+	if (meta._sorted) {
+		const {iScale, _parsed} = meta;
+		const axis = iScale.axis;
+		const {min, max, minDefined, maxDefined} = iScale.getUserBounds();
+		if (minDefined) {
+			start = _limitValue(Math.min(
+				_lookupByKey(_parsed, iScale.axis, min).lo,
+				animationsDisabled ? pointCount : _lookupByKey(points, axis, iScale.getPixelForValue(min)).lo),
+			0, pointCount - 1);
+		}
+		if (maxDefined) {
+			count = _limitValue(Math.max(
+				_lookupByKey(_parsed, iScale.axis, max).hi + 1,
+				animationsDisabled ? 0 : _lookupByKey(points, axis, iScale.getPixelForValue(max)).hi + 1),
+			start, pointCount) - start;
+		} else {
+			count = pointCount - start;
+		}
+	}
+
+	return {start, count};
+}
+
+function scaleRangesChanged(meta) {
+	const {xScale, yScale, _scaleRanges} = meta;
+	const newRanges = {
+		xmin: xScale.min,
+		xmax: xScale.max,
+		ymin: yScale.min,
+		ymax: yScale.max
+	};
+	if (!_scaleRanges) {
+		meta._scaleRanges = newRanges;
+		return true;
+	}
+	const changed = _scaleRanges.xmin !== xScale.min
+		|| _scaleRanges.xmax !== xScale.max
+		|| _scaleRanges.ymin !== yScale.min
+		|| _scaleRanges.ymax !== yScale.max;
+
+	Object.assign(_scaleRanges, newRanges);
+	return changed;
+}
diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 60e5c042b77..26d61ff7e89 100644
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -21,7 +21,7 @@ export default class PolarAreaController extends DatasetController {
 		const arcs = this._cachedMeta.data;
 
 		this._updateRadius();
-		this.updateElements(arcs, 0, mode);
+		this.updateElements(arcs, 0, arcs.length, mode);
 	}
 
 	/**
@@ -42,7 +42,7 @@ export default class PolarAreaController extends DatasetController {
 		me.innerRadius = me.outerRadius - radiusLength;
 	}
 
-	updateElements(arcs, start, mode) {
+	updateElements(arcs, start, count, mode) {
 		const me = this;
 		const reset = mode === 'reset';
 		const chart = me.chart;
@@ -61,12 +61,11 @@ export default class PolarAreaController extends DatasetController {
 		for (i = 0; i < start; ++i) {
 			angle += me._computeAngle(i);
 		}
-		for (i = 0; i < arcs.length; i++) {
+		for (i = start; i < start + count; i++) {
 			const arc = arcs[i];
-			const index = start + i;
 			let startAngle = angle;
-			let endAngle = angle + me._computeAngle(index);
-			let outerRadius = this.chart.getDataVisibility(index) ? scale.getDistanceFromCenterForValue(dataset.data[index]) : 0;
+			let endAngle = angle + me._computeAngle(i);
+			let outerRadius = this.chart.getDataVisibility(i) ? scale.getDistanceFromCenterForValue(dataset.data[i]) : 0;
 			angle = endAngle;
 
 			if (reset) {
@@ -86,10 +85,10 @@ export default class PolarAreaController extends DatasetController {
 				outerRadius,
 				startAngle,
 				endAngle,
-				options: me.resolveDataElementOptions(index, mode)
+				options: me.resolveDataElementOptions(i, mode)
 			};
 
-			me.updateElement(arc, index, properties, mode);
+			me.updateElement(arc, i, properties, mode);
 		}
 	}
 
diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index 1c30e0c0f99..19283338f27 100644
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -38,21 +38,19 @@ export default class RadarController extends DatasetController {
 		}
 
 		// Update Points
-		me.updateElements(points, 0, mode);
+		me.updateElements(points, 0, points.length, mode);
 	}
 
-	updateElements(points, start, mode) {
+	updateElements(points, start, count, mode) {
 		const me = this;
 		const dataset = me.getDataset();
 		const scale = me._cachedMeta.rScale;
 		const reset = mode === 'reset';
-		let i;
 
-		for (i = 0; i < points.length; i++) {
+		for (let i = start; i < start + count; i++) {
 			const point = points[i];
-			const index = start + i;
-			const options = me.resolveDataElementOptions(index, mode);
-			const pointPosition = scale.getPointPositionForValue(index, dataset.data[index]);
+			const options = me.resolveDataElementOptions(i, mode);
+			const pointPosition = scale.getPointPositionForValue(i, dataset.data[i]);
 
 			const x = reset ? scale.xCenter : pointPosition.x;
 			const y = reset ? scale.yCenter : pointPosition.y;
@@ -65,7 +63,7 @@ export default class RadarController extends DatasetController {
 				options
 			};
 
-			me.updateElement(point, index, properties, mode);
+			me.updateElement(point, i, properties, mode);
 		}
 	}
 
diff --git a/src/core/core.animations.js b/src/core/core.animations.js
index 36549aa9af9..1a4e9b0ca50 100644
--- a/src/core/core.animations.js
+++ b/src/core/core.animations.js
@@ -129,7 +129,7 @@ export default class Animations {
 			// Going from distinct options to shared options:
 			// After all animations are done, assing the shared options object to the element
 			// So any new updates to the shared options are observed
-			awaitAll(target.$animations, newOptions).then(() => {
+			awaitAll(target.options.$animations, newOptions).then(() => {
 				target.options = newOptions;
 			});
 		}
diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 1bd8d39de81..5f0834b87f3 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -6,7 +6,7 @@ import layouts from './core.layouts';
 import {BasicPlatform, DomPlatform} from '../platform';
 import PluginService from './core.plugins';
 import registry from './core.registry';
-import {getMaximumWidth, getMaximumHeight, retinaScale} from '../helpers/helpers.dom';
+import {retinaScale} from '../helpers/helpers.dom';
 import {mergeIf, merge, _merger, each, callback as callCallback, uid, valueOrDefault, _elementsEqual} from '../helpers/helpers.core';
 import {clear as canvasClear, clipArea, unclipArea, _isPointInArea} from '../helpers/helpers.canvas';
 // @ts-ignore
@@ -177,18 +177,18 @@ function compare2Level(l1, l2) {
 	};
 }
 
-function onAnimationsComplete(ctx) {
-	const chart = ctx.chart;
+function onAnimationsComplete(context) {
+	const chart = context.chart;
 	const animationOptions = chart.options.animation;
 
 	chart._plugins.notify(chart, 'afterRender');
-	callCallback(animationOptions && animationOptions.onComplete, [ctx], chart);
+	callCallback(animationOptions && animationOptions.onComplete, [context], chart);
 }
 
-function onAnimationProgress(ctx) {
-	const chart = ctx.chart;
+function onAnimationProgress(context) {
+	const chart = context.chart;
 	const animationOptions = chart.options.animation;
-	callCallback(animationOptions && animationOptions.onProgress, [ctx], chart);
+	callCallback(animationOptions && animationOptions.onProgress, [context], chart);
 }
 
 function isDomSupported() {
@@ -202,7 +202,7 @@ function isDomSupported() {
 function getCanvas(item) {
 	if (isDomSupported() && typeof item === 'string') {
 		item = document.getElementById(item);
-	} else if (item.length) {
+	} else if (item && item.length) {
 		// Support for array based queries (such as jQuery)
 		item = item[0];
 	}
@@ -214,22 +214,6 @@ function getCanvas(item) {
 	return item;
 }
 
-function computeNewSize(canvas, width, height, aspectRatio) {
-	if (width === undefined || height === undefined) {
-		width = getMaximumWidth(canvas);
-		height = getMaximumHeight(canvas);
-	}
-	// the canvas render width and height will be casted to integers so make sure that
-	// the canvas display style uses the same integer values to avoid blurring effect.
-
-	// Minimum values set to 0 instead of canvas.size because the size defaults to 300x150 if the element is collapsed
-	width = Math.max(0, Math.floor(width));
-	return {
-		width,
-		height: Math.max(0, Math.floor(aspectRatio ? width / aspectRatio : height))
-	};
-}
-
 class Chart {
 
 	// eslint-disable-next-line max-statements
@@ -355,7 +339,7 @@ class Chart {
 		const options = me.options;
 		const canvas = me.canvas;
 		const aspectRatio = options.maintainAspectRatio && me.aspectRatio;
-		const newSize = computeNewSize(canvas, width, height, aspectRatio);
+		const newSize = me.platform.getMaximumSize(canvas, width, height, aspectRatio);
 
 		// detect devicePixelRation changes
 		const oldRatio = me.currentDevicePixelRatio;
@@ -701,14 +685,9 @@ class Chart {
 
 	render() {
 		const me = this;
-		const animationOptions = me.options.animation;
 		if (me._plugins.notify(me, 'beforeRender') === false) {
 			return;
 		}
-		const onComplete = function() {
-			me._plugins.notify(me, 'afterRender');
-			callCallback(animationOptions && animationOptions.onComplete, [], me);
-		};
 
 		if (animator.has(me)) {
 			if (me.attached && !animator.running(me)) {
@@ -716,7 +695,7 @@ class Chart {
 			}
 		} else {
 			me.draw();
-			onComplete();
+			onAnimationsComplete({chart: me});
 		}
 	}
 
@@ -998,7 +977,9 @@ class Chart {
 			}
 		};
 
-		let listener = function(e) {
+		let listener = function(e, x, y) {
+			e.offsetX = x;
+			e.offsetY = y;
 			me._eventHandler(e);
 		};
 
@@ -1015,8 +996,8 @@ class Chart {
 			const attached = () => {
 				_remove('attach', attached);
 
-				me.resize();
 				me.attached = true;
+				me.resize();
 
 				_add('resize', listener);
 				_add('detach', detached);
diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
index 7f5a958ccd9..3d8bfdf7e59 100644
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@ -179,6 +179,8 @@ export default class DatasetController {
 		this._data = undefined;
 		this._objectData = undefined;
 		this._sharedOptions = undefined;
+		this._drawStart = undefined;
+		this._drawCount = undefined;
 		this.enableOptionSharing = false;
 
 		this.initialize();
@@ -380,11 +382,11 @@ export default class DatasetController {
 				parsed = me.parsePrimitiveData(meta, data, start, count);
 			}
 
-
+			const isNotInOrderComparedToPrev = () => isNaN(cur[iAxis]) || (prev && cur[iAxis] < prev[iAxis]);
 			for (i = 0; i < count; ++i) {
 				meta._parsed[i + start] = cur = parsed[i];
 				if (sorted) {
-					if (prev && cur[iAxis] < prev[iAxis]) {
+					if (isNotInOrderComparedToPrev()) {
 						sorted = false;
 					}
 					prev = cur;
@@ -544,7 +546,7 @@ export default class DatasetController {
 			parsed = _parsed[i];
 			value = parsed[scale.axis];
 			otherValue = parsed[otherScale.axis];
-			return (isNaN(value) || otherMin > otherValue || otherMax < otherValue);
+			return (isNaN(value) || isNaN(otherValue) || otherMin > otherValue || otherMax < otherValue);
 		}
 
 		for (i = 0; i < ilen; ++i) {
@@ -633,13 +635,15 @@ export default class DatasetController {
 		const elements = meta.data || [];
 		const area = chart.chartArea;
 		const active = [];
-		let i, ilen;
+		const start = me._drawStart || 0;
+		const count = me._drawCount || (elements.length - start);
+		let i;
 
 		if (meta.dataset) {
-			meta.dataset.draw(ctx, area);
+			meta.dataset.draw(ctx, area, start, count);
 		}
 
-		for (i = 0, ilen = elements.length; i < ilen; ++i) {
+		for (i = start; i < start + count; ++i) {
 			const element = elements[i];
 			if (element.active) {
 				active.push(element);
@@ -648,7 +652,7 @@ export default class DatasetController {
 			}
 		}
 
-		for (i = 0, ilen = active.length; i < ilen; ++i) {
+		for (i = 0; i < active.length; ++i) {
 			active[i].draw(ctx, area);
 		}
 	}
@@ -800,9 +804,9 @@ export default class DatasetController {
 
 		const info = {cacheable: true};
 		const context = me._getContext(index, active);
-		const datasetAnim = resolve([me._config.animation], context, index, info);
 		const chartAnim = resolve([chart.options.animation], context, index, info);
-		let config = mergeIf({}, [datasetAnim, chartAnim]);
+		const datasetAnim = resolve([me._config.animation], context, index, info);
+		let config = chartAnim && mergeIf({}, [datasetAnim, chartAnim]);
 
 		if (config[mode]) {
 			config = Object.assign({}, config, config[mode]);
@@ -936,10 +940,10 @@ export default class DatasetController {
 		}
 		me.parse(start, count);
 
-		me.updateElements(elements, start, 'reset');
+		me.updateElements(data, start, count, 'reset');
 	}
 
-	updateElements(element, start, mode) {} // eslint-disable-line no-unused-vars
+	updateElements(element, start, count, mode) {} // eslint-disable-line no-unused-vars
 
 	/**
 	 * @private
diff --git a/src/core/core.interaction.js b/src/core/core.interaction.js
index 9b130769db7..6ee3106238c 100644
--- a/src/core/core.interaction.js
+++ b/src/core/core.interaction.js
@@ -180,6 +180,31 @@ function getNearestItems(chart, position, axis, intersect, useFinalPosition) {
 	return items;
 }
 
+function getAxisItems(chart, e, options, useFinalPosition) {
+	const position = getRelativePosition(e, chart);
+	const items = [];
+	const axis = options.axis;
+	const rangeMethod = axis === 'x' ? 'inXRange' : 'inYRange';
+	let intersectsItem = false;
+
+	evaluateAllVisibleItems(chart, (element, datasetIndex, index) => {
+		if (element[rangeMethod](position[axis], useFinalPosition)) {
+			items.push({element, datasetIndex, index});
+		}
+
+		if (element.inRange(position.x, position.y, useFinalPosition)) {
+			intersectsItem = true;
+		}
+	});
+
+	// If we want to trigger on an intersect and we don't have any items
+	// that intersect the position, return nothing
+	if (options.intersect && !intersectsItem) {
+		return [];
+	}
+	return items;
+}
+
 /**
  * Contains interaction related functions
  * @namespace Chart.Interaction
@@ -294,26 +319,8 @@ export default {
 		 * @return {InteractionItem[]} - items that are found
 		 */
 		x(chart, e, options, useFinalPosition) {
-			const position = getRelativePosition(e, chart);
-			const items = [];
-			let intersectsItem = false;
-
-			evaluateAllVisibleItems(chart, (element, datasetIndex, index) => {
-				if (element.inXRange(position.x, useFinalPosition)) {
-					items.push({element, datasetIndex, index});
-				}
-
-				if (element.inRange(position.x, position.y, useFinalPosition)) {
-					intersectsItem = true;
-				}
-			});
-
-			// If we want to trigger on an intersect and we don't have any items
-			// that intersect the position, return nothing
-			if (options.intersect && !intersectsItem) {
-				return [];
-			}
-			return items;
+			options.axis = 'x';
+			return getAxisItems(chart, e, options, useFinalPosition);
 		},
 
 		/**
@@ -326,26 +333,8 @@ export default {
 		 * @return {InteractionItem[]} - items that are found
 		 */
 		y(chart, e, options, useFinalPosition) {
-			const position = getRelativePosition(e, chart);
-			const items = [];
-			let intersectsItem = false;
-
-			evaluateAllVisibleItems(chart, (element, datasetIndex, index) => {
-				if (element.inYRange(position.y, useFinalPosition)) {
-					items.push({element, datasetIndex, index});
-				}
-
-				if (element.inRange(position.x, position.y, useFinalPosition)) {
-					intersectsItem = true;
-				}
-			});
-
-			// If we want to trigger on an intersect and we don't have any items
-			// that intersect the position, return nothing
-			if (options.intersect && !intersectsItem) {
-				return [];
-			}
-			return items;
+			options.axis = 'y';
+			return getAxisItems(chart, e, options, useFinalPosition);
 		}
 	}
 };
diff --git a/src/core/core.plugins.js b/src/core/core.plugins.js
index 4ceab715ec1..d24b4d56a4a 100644
--- a/src/core/core.plugins.js
+++ b/src/core/core.plugins.js
@@ -289,8 +289,8 @@ function createDescriptors(plugins, options) {
  * the event will be discarded.
  * @param {Chart} chart - The chart instance.
  * @param {IEvent} event - The event object.
- * @param {object} options - The plugin options.
  * @param {boolean} replay - True if this event is replayed from `Chart.update`
+ * @param {object} options - The plugin options.
  */
 /**
  * @method IPlugin#afterEvent
@@ -298,8 +298,8 @@ function createDescriptors(plugins, options) {
  * will not be called if the `event` has been previously discarded.
  * @param {Chart} chart - The chart instance.
  * @param {IEvent} event - The event object.
- * @param {object} options - The plugin options.
  * @param {boolean} replay - True if this event is replayed from `Chart.update`
+ * @param {object} options - The plugin options.
  */
 /**
  * @method IPlugin#resize
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index c8fc02bbcb1..ae3a2697c20 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -2,7 +2,7 @@ import defaults from './core.defaults';
 import Element from './core.element';
 import {_alignPixel, _measureText} from '../helpers/helpers.canvas';
 import {callback as call, each, isArray, isFinite, isNullOrUndef, isObject, valueOrDefault} from '../helpers/helpers.core';
-import {_factorize, toDegrees, toRadians} from '../helpers/helpers.math';
+import {_factorize, toDegrees, toRadians, _int32Range} from '../helpers/helpers.math';
 import {toFont, resolve, toPadding} from '../helpers/helpers.options';
 import Ticks from './core.ticks';
 
@@ -981,7 +981,7 @@ export default class Scale extends Element {
 			decimal = 1 - decimal;
 		}
 
-		return me._startPixel + decimal * me._length;
+		return _int32Range(me._startPixel + decimal * me._length);
 	}
 
 	/**
diff --git a/src/core/core.ticks.js b/src/core/core.ticks.js
index 9380f16c6d7..1b75c13b069 100644
--- a/src/core/core.ticks.js
+++ b/src/core/core.ticks.js
@@ -1,6 +1,7 @@
 import {isArray} from '../helpers/helpers.core';
 import {log10} from '../helpers/helpers.math';
 
+const intlCache = new Map();
 /**
  * Namespace to hold formatters for different types of ticks
  * @namespace Chart.Ticks.formatters
@@ -54,8 +55,14 @@ const formatters = {
 		const options = {notation, minimumFractionDigits: numDecimal, maximumFractionDigits: numDecimal};
 		Object.assign(options, this.options.ticks.format);
 
-		// @ts-ignore until TypeScript 4.0 because "notation" was previously experimental API
-		return new Intl.NumberFormat(locale, options).format(tickValue);
+		const cacheKey = locale + JSON.stringify(options);
+		let formatter = intlCache.get(cacheKey);
+		if (!formatter) {
+			formatter = new Intl.NumberFormat(locale, options);
+			intlCache.set(cacheKey, formatter);
+		}
+
+		return formatter.format(tickValue);
 	}
 };
 
diff --git a/src/elements/element.line.js b/src/elements/element.line.js
index d01278d3ef3..778aeab57a0 100644
--- a/src/elements/element.line.js
+++ b/src/elements/element.line.js
@@ -33,6 +33,20 @@ function getLineMethod(options) {
 	return lineTo;
 }
 
+function pathVars(points, segment, params) {
+	params = params || {};
+	const count = points.length;
+	const start = Math.max(params.start || 0, segment.start);
+	const end = Math.min(params.end || count - 1, segment.end);
+
+	return {
+		count,
+		start,
+		loop: segment.loop,
+		ilen: end < start ? count + end - start : end - start
+	};
+}
+
 /**
  * Create path from points, grouping by truncated x-coordinate
  * Points need to be in order by x-coordinate for this to work efficiently
@@ -43,17 +57,17 @@ function getLineMethod(options) {
  * @param {number} segment.end - end index of the segment, referring the points array
  * @param {boolean} segment.loop - indicates that the segment is a loop
  * @param {object} params
- * @param {object} params.move - move to starting point (vs line to it)
- * @param {object} params.reverse - path the segment from end to start
+ * @param {boolean} params.move - move to starting point (vs line to it)
+ * @param {boolean} params.reverse - path the segment from end to start
+ * @param {number} params.start - limit segment to points starting from `start` index
+ * @param {number} params.end - limit segment to points ending at `start` + `count` index
  */
 function pathSegment(ctx, line, segment, params) {
-	const {start, end, loop} = segment;
 	const {points, options} = line;
+	const {count, start, loop, ilen} = pathVars(points, segment, params);
 	const lineMethod = getLineMethod(options);
-	const count = points.length;
 	// eslint-disable-next-line prefer-const
 	let {move = true, reverse} = params || {};
-	const ilen = end < start ? count + end - start : end - start;
 	let i, point, prev;
 
 	for (i = 0; i <= ilen; ++i) {
@@ -90,15 +104,15 @@ function pathSegment(ctx, line, segment, params) {
  * @param {number} segment.end - end index of the segment, referring the points array
  * @param {boolean} segment.loop - indicates that the segment is a loop
  * @param {object} params
- * @param {object} params.move - move to starting point (vs line to it)
- * @param {object} params.reverse - path the segment from end to start
+ * @param {boolean} params.move - move to starting point (vs line to it)
+ * @param {boolean} params.reverse - path the segment from end to start
+ * @param {number} params.start - limit segment to points starting from `start` index
+ * @param {number} params.end - limit segment to points ending at `start` + `count` index
  */
 function fastPathSegment(ctx, line, segment, params) {
 	const points = line.points;
-	const count = points.length;
-	const {start, end} = segment;
+	const {count, start, ilen} = pathVars(points, segment, params);
 	const {move = true, reverse} = params || {};
-	const ilen = end < start ? count + end - start : end - start;
 	let avgX = 0;
 	let countX = 0;
 	let i, point, prevX, minY, maxY, lastY;
@@ -290,8 +304,10 @@ export default class Line extends Element {
  	 * @param {number} segment.end - end index of the segment, referring the points array
  	 * @param {boolean} segment.loop - indicates that the segment is a loop
 	 * @param {object} params
-	 * @param {object} params.move - move to starting point (vs line to it)
-	 * @param {object} params.reverse - path the segment from end to start
+	 * @param {boolean} params.move - move to starting point (vs line to it)
+	 * @param {boolean} params.reverse - path the segment from end to start
+	 * @param {number} params.start - limit segment to points starting from `start` index
+	 * @param {number} params.end - limit segment to points ending at `start` + `count` index
 	 * @returns {undefined|boolean} - true if the segment is a full loop (path should be closed)
 	 */
 	pathSegment(ctx, segment, params) {
@@ -302,16 +318,22 @@ export default class Line extends Element {
 	/**
 	 * Append all segments of this line to current path.
 	 * @param {CanvasRenderingContext2D} ctx
+	 * @param {number} [start]
+	 * @param {number} [count]
 	 * @returns {undefined|boolean} - true if line is a full loop (path should be closed)
 	 */
-	path(ctx) {
+	path(ctx, start, count) {
 		const me = this;
 		const segments = me.segments;
 		const ilen = segments.length;
 		const segmentMethod = _getSegmentMethod(me);
 		let loop = me._loop;
+
+		start = start || 0;
+		count = count || (me.points.length - start);
+
 		for (let i = 0; i < ilen; ++i) {
-			loop &= segmentMethod(ctx, me, segments[i]);
+			loop &= segmentMethod(ctx, me, segments[i], {start, end: start + count - 1});
 		}
 		return !!loop;
 	}
@@ -319,8 +341,11 @@ export default class Line extends Element {
 	/**
 	 * Draw
 	 * @param {CanvasRenderingContext2D} ctx
+	 * @param {object} chartArea
+	 * @param {number} [start]
+	 * @param {number} [count]
 	 */
-	draw(ctx) {
+	draw(ctx, chartArea, start, count) {
 		const options = this.options || {};
 		const points = this.points || [];
 
@@ -334,7 +359,7 @@ export default class Line extends Element {
 
 		ctx.beginPath();
 
-		if (this.path(ctx)) {
+		if (this.path(ctx, start, count)) {
 			ctx.closePath();
 		}
 
diff --git a/src/elements/element.rectangle.js b/src/elements/element.rectangle.js
index 2363a87ffde..990a28c20b6 100644
--- a/src/elements/element.rectangle.js
+++ b/src/elements/element.rectangle.js
@@ -1,5 +1,5 @@
 import Element from '../core/core.element';
-import {isObject} from '../helpers/helpers.core';
+import {toTRBL} from '../helpers/helpers.options';
 
 /**
  * Helper function to get the bounds of the bar regardless of the orientation
@@ -71,22 +71,13 @@ function skipOrLimit(skip, value, min, max) {
 function parseBorderWidth(bar, maxW, maxH) {
 	const value = bar.options.borderWidth;
 	const skip = parseBorderSkipped(bar);
-	let t, r, b, l;
-
-	if (isObject(value)) {
-		t = +value.top || 0;
-		r = +value.right || 0;
-		b = +value.bottom || 0;
-		l = +value.left || 0;
-	} else {
-		t = r = b = l = +value || 0;
-	}
+	const o = toTRBL(value);
 
 	return {
-		t: skipOrLimit(skip.top, t, 0, maxH),
-		r: skipOrLimit(skip.right, r, 0, maxW),
-		b: skipOrLimit(skip.bottom, b, 0, maxH),
-		l: skipOrLimit(skip.left, l, 0, maxW)
+		t: skipOrLimit(skip.top, o.top, 0, maxH),
+		r: skipOrLimit(skip.right, o.right, 0, maxW),
+		b: skipOrLimit(skip.bottom, o.bottom, 0, maxH),
+		l: skipOrLimit(skip.left, o.left, 0, maxW)
 	};
 }
 
@@ -115,7 +106,8 @@ function boundingRects(bar) {
 function inRange(bar, x, y, useFinalPosition) {
 	const skipX = x === null;
 	const skipY = y === null;
-	const bounds = !bar || (skipX && skipY) ? false : getBarBounds(bar, useFinalPosition);
+	const skipBoth = skipX && skipY;
+	const bounds = bar && !skipBoth && getBarBounds(bar, useFinalPosition);
 
 	return bounds
 		&& (skipX || x >= bounds.left && x <= bounds.right)
diff --git a/src/helpers/helpers.collection.js b/src/helpers/helpers.collection.js
index 4cea116ce5f..d973464d2dd 100644
--- a/src/helpers/helpers.collection.js
+++ b/src/helpers/helpers.collection.js
@@ -4,16 +4,18 @@ import {_capitalize} from './helpers.core';
  * Binary search
  * @param {array} table - the table search. must be sorted!
  * @param {number} value - value to find
+ * @param {function} [cmp]
  * @private
  */
-export function _lookup(table, value) {
+export function _lookup(table, value, cmp) {
+	cmp = cmp || ((index) => table[index] < value);
 	let hi = table.length - 1;
 	let lo = 0;
 	let mid;
 
 	while (hi - lo > 1) {
 		mid = (lo + hi) >> 1;
-		if (table[mid] < value) {
+		if (cmp(mid)) {
 			lo = mid;
 		} else {
 			hi = mid;
@@ -30,22 +32,8 @@ export function _lookup(table, value) {
  * @param {number} value - value to find
  * @private
  */
-export function _lookupByKey(table, key, value) {
-	let hi = table.length - 1;
-	let lo = 0;
-	let mid;
-
-	while (hi - lo > 1) {
-		mid = (lo + hi) >> 1;
-		if (table[mid][key] < value) {
-			lo = mid;
-		} else {
-			hi = mid;
-		}
-	}
-
-	return {lo, hi};
-}
+export const _lookupByKey = (table, key, value) =>
+	_lookup(table, value, index => table[index][key] < value);
 
 /**
  * Reverse binary search
@@ -54,22 +42,8 @@ export function _lookupByKey(table, key, value) {
  * @param {number} value - value to find
  * @private
  */
-export function _rlookupByKey(table, key, value) {
-	let hi = table.length - 1;
-	let lo = 0;
-	let mid;
-
-	while (hi - lo > 1) {
-		mid = (lo + hi) >> 1;
-		if (table[mid][key] < value) {
-			hi = mid;
-		} else {
-			lo = mid;
-		}
-	}
-
-	return {lo, hi};
-}
+export const _rlookupByKey = (table, key, value) =>
+	_lookup(table, value, index => table[index][key] >= value);
 
 /**
  * Return subset of `values` between `min` and `max` inclusive.
diff --git a/src/helpers/helpers.dom.js b/src/helpers/helpers.dom.js
index 1a2376a05f5..e813079ef10 100644
--- a/src/helpers/helpers.dom.js
+++ b/src/helpers/helpers.dom.js
@@ -1,11 +1,3 @@
-/**
- * Returns if the given value contains an effective constraint.
- * @private
- */
-function isConstrainedValue(value) {
-	return value !== undefined && value !== null && value !== 'none';
-}
-
 /**
  * @private
  */
@@ -17,7 +9,10 @@ export function _getParentNode(domNode) {
 	return parent;
 }
 
-// Private helper function to convert max-width/max-height values that may be percentages into a number
+/**
+ * convert max-width/max-height values that may be percentages into a number
+ * @private
+ */
 function parseMaxStyle(styleValue, node, parentProperty) {
 	let valueInPixels;
 	if (typeof styleValue === 'string') {
@@ -34,128 +29,116 @@ function parseMaxStyle(styleValue, node, parentProperty) {
 	return valueInPixels;
 }
 
-/**
- * Returns the max width or height of the given DOM node in a cross-browser compatible fashion
- * @param {HTMLElement} domNode - the node to check the constraint on
- * @param {string} maxStyle - the style that defines the maximum for the direction we are using ('max-width' / 'max-height')
- * @param {string} percentageProperty - property of parent to use when calculating width as a percentage
- * @return {number=} number or undefined if no constraint
- * @see {@link https://www.nathanaeljones.com/blog/2013/reading-max-width-cross-browser}
- */
-function getConstraintDimension(domNode, maxStyle, percentageProperty) {
-	const view = document.defaultView;
-	const parentNode = _getParentNode(domNode);
-	const constrainedNode = view.getComputedStyle(domNode)[maxStyle];
-	const constrainedContainer = view.getComputedStyle(parentNode)[maxStyle];
-	const hasCNode = isConstrainedValue(constrainedNode);
-	const hasCContainer = isConstrainedValue(constrainedContainer);
-	const infinity = Number.POSITIVE_INFINITY;
-
-	if (hasCNode || hasCContainer) {
-		return Math.min(
-			hasCNode ? parseMaxStyle(constrainedNode, domNode, percentageProperty) : infinity,
-			hasCContainer ? parseMaxStyle(constrainedContainer, parentNode, percentageProperty) : infinity);
-	}
-}
+const getComputedStyle = (element) => window.getComputedStyle(element, null);
 
 export function getStyle(el, property) {
 	return el.currentStyle ?
 		el.currentStyle[property] :
-		document.defaultView.getComputedStyle(el, null).getPropertyValue(property);
-}
-
-/** @return {number=} number or undefined if no constraint */
-function getConstraintWidth(domNode) {
-	return getConstraintDimension(domNode, 'max-width', 'clientWidth');
-}
-
-/** @return {number=} number or undefined if no constraint */
-function getConstraintHeight(domNode) {
-	return getConstraintDimension(domNode, 'max-height', 'clientHeight');
+		getComputedStyle(el).getPropertyValue(property);
 }
 
-/**
- * @private
- */
-function _calculatePadding(container, padding, parentDimension) {
-	padding = getStyle(container, padding);
-
-	// If the padding is not set at all and the node is not in the DOM, this can be an empty string
-	// In that case, we need to handle it as no padding
-	if (padding === '') {
-		return 0;
+const positions = ['top', 'right', 'bottom', 'left'];
+function getPositionedStyle(styles, style, suffix) {
+	const result = {};
+	suffix = suffix ? '-' + suffix : '';
+	for (let i = 0; i < 4; i++) {
+		const pos = positions[i];
+		result[pos] = parseFloat(styles[style + '-' + pos + suffix]) || 0;
 	}
-
-	return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
+	result.width = result.left + result.right;
+	result.height = result.top + result.bottom;
+	return result;
 }
 
-export function getRelativePosition(evt, chart) {
+function getCanvasPosition(evt, canvas) {
 	const e = evt.originalEvent || evt;
 	const touches = e.touches;
 	const source = touches && touches.length ? touches[0] : e;
-	const clientX = source.clientX;
-	const clientY = source.clientY;
-
-	const x = source.offsetX || source.layerX || clientX;
-	const y = source.offsetY || source.layerY || clientY;
-
-	if (x !== clientX && y !== clientY) {
-		return {x, y};
+	const {offsetX, offsetY} = source;
+	let box = false;
+	let x, y;
+	if (offsetX > 0 || offsetY > 0) {
+		x = offsetX;
+		y = offsetY;
+	} else {
+		const rect = canvas.getBoundingClientRect();
+		x = source.clientX - rect.left;
+		y = source.clientY - rect.top;
+		box = true;
 	}
+	return {x, y, box};
+}
 
-	const canvasElement = chart.canvas;
-	const devicePixelRatio = chart.currentDevicePixelRatio;
-	const boundingRect = canvasElement.getBoundingClientRect();
-	// Scale mouse coordinates into canvas coordinates
-	// by following the pattern laid out by 'jerryj' in the comments of
-	// https://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
-	const paddingLeft = parseFloat(getStyle(canvasElement, 'padding-left'));
-	const paddingTop = parseFloat(getStyle(canvasElement, 'padding-top'));
-	const paddingRight = parseFloat(getStyle(canvasElement, 'padding-right'));
-	const paddingBottom = parseFloat(getStyle(canvasElement, 'padding-bottom'));
-	const width = boundingRect.right - boundingRect.left - paddingLeft - paddingRight;
-	const height = boundingRect.bottom - boundingRect.top - paddingTop - paddingBottom;
-
-	// We divide by the current device pixel ratio, because the canvas is scaled up by that amount in each direction. However
-	// the backend model is in unscaled coordinates. Since we are going to deal with our model coordinates, we go back here
+export function getRelativePosition(evt, chart) {
+	const {canvas, currentDevicePixelRatio} = chart;
+	const style = getComputedStyle(canvas);
+	const borderBox = style.boxSizing === 'border-box';
+	const paddings = getPositionedStyle(style, 'padding');
+	const borders = getPositionedStyle(style, 'border', 'width');
+	const {x, y, box} = getCanvasPosition(evt, canvas);
+	const xOffset = paddings.left + (box && borders.left);
+	const yOffset = paddings.top + (box && borders.top);
+
+	let {width, height} = chart;
+	if (borderBox) {
+		width -= paddings.width + borders.width;
+		height -= paddings.height + borders.height;
+	}
 	return {
-		x: Math.round((x - boundingRect.left - paddingLeft) / (width) * canvasElement.width / devicePixelRatio),
-		y: Math.round((y - boundingRect.top - paddingTop) / (height) * canvasElement.height / devicePixelRatio)
+		x: Math.round((x - xOffset) / width * canvas.width / currentDevicePixelRatio),
+		y: Math.round((y - yOffset) / height * canvas.height / currentDevicePixelRatio)
 	};
 }
 
-function fallbackIfNotValid(measure, fallback) {
-	return typeof measure === 'number' ? measure : fallback;
-}
-
-export function getMaximumWidth(domNode) {
-	const container = _getParentNode(domNode);
-	if (!container) {
-		return fallbackIfNotValid(domNode.clientWidth, domNode.width);
+const infinity = Number.POSITIVE_INFINITY;
+
+function getContainerSize(canvas, width, height) {
+	let maxWidth, maxHeight;
+
+	if (width === undefined || height === undefined) {
+		const container = _getParentNode(canvas);
+		if (!container) {
+			width = canvas.clientWidth;
+			height = canvas.clientHeight;
+		} else {
+			const rect = container.getBoundingClientRect(); // this is the border box of the container
+			const containerStyle = getComputedStyle(container);
+			const containerBorder = getPositionedStyle(containerStyle, 'border', 'width');
+			const contarinerPadding = getPositionedStyle(containerStyle, 'padding');
+			width = rect.width - contarinerPadding.width - containerBorder.width;
+			height = rect.height - contarinerPadding.height - containerBorder.height;
+			maxWidth = parseMaxStyle(containerStyle.maxWidth, container, 'clientWidth');
+			maxHeight = parseMaxStyle(containerStyle.maxHeight, container, 'clientHeight');
+		}
 	}
-
-	const clientWidth = container.clientWidth;
-	const paddingLeft = _calculatePadding(container, 'padding-left', clientWidth);
-	const paddingRight = _calculatePadding(container, 'padding-right', clientWidth);
-
-	const w = clientWidth - paddingLeft - paddingRight;
-	const cw = getConstraintWidth(domNode);
-	return isNaN(cw) ? w : Math.min(w, cw);
+	return {
+		width,
+		height,
+		maxWidth: maxWidth || infinity,
+		maxHeight: maxHeight || infinity
+	};
 }
 
-export function getMaximumHeight(domNode) {
-	const container = _getParentNode(domNode);
-	if (!container) {
-		return fallbackIfNotValid(domNode.clientHeight, domNode.height);
+export function getMaximumSize(canvas, bbWidth, bbHeight, aspectRatio) {
+	const style = getComputedStyle(canvas);
+	const margins = getPositionedStyle(style, 'margin');
+	const maxWidth = parseMaxStyle(style.maxWidth, canvas, 'clientWidth') || infinity;
+	const maxHeight = parseMaxStyle(style.maxHeight, canvas, 'clientHeight') || infinity;
+	const containerSize = getContainerSize(canvas, bbWidth, bbHeight);
+	let {width, height} = containerSize;
+
+	if (style.boxSizing === 'content-box') {
+		const borders = getPositionedStyle(style, 'border', 'width');
+		const paddings = getPositionedStyle(style, 'padding');
+		width -= paddings.width + borders.width;
+		height -= paddings.height + borders.height;
 	}
-
-	const clientHeight = container.clientHeight;
-	const paddingTop = _calculatePadding(container, 'padding-top', clientHeight);
-	const paddingBottom = _calculatePadding(container, 'padding-bottom', clientHeight);
-
-	const h = clientHeight - paddingTop - paddingBottom;
-	const ch = getConstraintHeight(domNode);
-	return isNaN(ch) ? h : Math.min(h, ch);
+	width = Math.max(0, width - margins.width);
+	height = Math.max(0, aspectRatio ? Math.floor(width / aspectRatio) : height - margins.height);
+	return {
+		width: Math.min(width, maxWidth, containerSize.maxWidth),
+		height: Math.min(height, maxHeight, containerSize.maxHeight)
+	};
 }
 
 export function retinaScale(chart, forceRatio) {
diff --git a/src/helpers/helpers.extras.js b/src/helpers/helpers.extras.js
index 0bfec3e091a..e821fb967ee 100644
--- a/src/helpers/helpers.extras.js
+++ b/src/helpers/helpers.extras.js
@@ -19,13 +19,15 @@ export const requestAnimFrame = (function() {
  * Latest argments are used on the actual call
  * @param {function} fn
  * @param {*} thisArg
+ * @param {function} [updateFn]
  */
-export function throttled(fn, thisArg) {
+export function throttled(fn, thisArg, updateFn) {
+	const updateArgs = updateFn || ((args) => Array.prototype.slice.call(args));
 	let ticking = false;
 	let args = [];
 
 	return function(...rest) {
-		args = Array.prototype.slice.call(rest);
+		args = updateArgs(rest);
 
 		if (!ticking) {
 			ticking = true;
diff --git a/src/helpers/helpers.math.js b/src/helpers/helpers.math.js
index b01c9b292ce..2fc9043c11e 100644
--- a/src/helpers/helpers.math.js
+++ b/src/helpers/helpers.math.js
@@ -172,3 +172,7 @@ export function _angleBetween(angle, start, end) {
 export function _limitValue(value, min, max) {
 	return Math.max(min, Math.min(max, value));
 }
+
+export function _int32Range(value) {
+	return _limitValue(value, -2147483648, 2147483647);
+}
diff --git a/src/helpers/helpers.options.js b/src/helpers/helpers.options.js
index 540f7c25043..ba61f5e5249 100644
--- a/src/helpers/helpers.options.js
+++ b/src/helpers/helpers.options.js
@@ -35,35 +35,51 @@ export function toLineHeight(value, size) {
 	return size * value;
 }
 
+const numberOrZero = v => +v || 0;
+
 /**
- * Converts the given value into a padding object with pre-computed width/height.
+ * Converts the given value into a TRBL object.
  * @param {number|object} value - If a number, set the value to all TRBL component,
  *  else, if an object, use defined properties and sets undefined ones to 0.
- * @returns {object} The padding values (top, right, bottom, left, width, height)
- * @since 2.7.0
+ * @returns {object} The padding values (top, right, bottom, left)
+ * @since 3.0.0
  */
-export function toPadding(value) {
+export function toTRBL(value) {
 	let t, r, b, l;
 
 	if (isObject(value)) {
-		t = +value.top || 0;
-		r = +value.right || 0;
-		b = +value.bottom || 0;
-		l = +value.left || 0;
+		t = numberOrZero(value.top);
+		r = numberOrZero(value.right);
+		b = numberOrZero(value.bottom);
+		l = numberOrZero(value.left);
 	} else {
-		t = r = b = l = +value || 0;
+		t = r = b = l = numberOrZero(value);
 	}
 
 	return {
 		top: t,
 		right: r,
 		bottom: b,
-		left: l,
-		height: t + b,
-		width: l + r
+		left: l
 	};
 }
 
+/**
+ * Converts the given value into a padding object with pre-computed width/height.
+ * @param {number|object} value - If a number, set the value to all TRBL component,
+ *  else, if an object, use defined properties and sets undefined ones to 0.
+ * @returns {object} The padding values (top, right, bottom, left, width, height)
+ * @since 2.7.0
+ */
+export function toPadding(value) {
+	const obj = toTRBL(value);
+
+	obj.width = obj.left + obj.right;
+	obj.height = obj.top + obj.bottom;
+
+	return obj;
+}
+
 /**
  * Parses font options and returns the font object.
  * @param {object} options - A object that contains font options to be parsed.
diff --git a/src/helpers/index.js b/src/helpers/index.js
index 4dec4c476f6..27bf6d97af4 100644
--- a/src/helpers/index.js
+++ b/src/helpers/index.js
@@ -1,36 +1,16 @@
 /* eslint-disable import/no-namespace */
 
-import * as coreHelpers from './helpers.core';
-import * as canvas from './helpers.canvas';
-import * as collection from './helpers.collection';
-import * as curve from './helpers.curve';
-import * as dom from './helpers.dom';
-import effects from './helpers.easing';
-import * as interpolation from './helpers.interpolation';
-import * as options from './helpers.options';
-import * as math from './helpers.math';
-import * as rtl from './helpers.rtl';
-import * as segment from './helpers.segment';
+export * from './helpers.core';
+export * from './helpers.canvas';
+export * from './helpers.collection';
+export * from './helpers.curve';
+export * from './helpers.dom';
+export {default as easingEffects} from './helpers.easing';
+export * from './helpers.interpolation';
+export * from './helpers.options';
+export * from './helpers.math';
+export * from './helpers.rtl';
+export * from './helpers.segment';
 
-import {color, getHoverColor} from './helpers.color';
-import {requestAnimFrame, fontString} from './helpers.extras';
-
-export default {
-	...coreHelpers,
-	canvas,
-	collection,
-	curve,
-	dom,
-	easing: {effects},
-	interpolation,
-	options,
-	math,
-	rtl,
-	segment,
-
-	requestAnimFrame,
-	// -- Canvas methods
-	fontString,
-	color,
-	getHoverColor
-};
+export {color, getHoverColor} from './helpers.color';
+export {requestAnimFrame, fontString} from './helpers.extras';
diff --git a/src/index.js b/src/index.js
index 8d1bfce48dc..9ce3fc5ae36 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,11 +1,12 @@
 /* eslint-disable import/no-namespace, import/namespace */
+// @ts-nocheck
 
 /**
  * @namespace Chart
  */
 import Chart from './core/core.controller';
 
-import helpers from './helpers/index';
+import * as helpers from './helpers/index';
 import _adapters from './core/core.adapters';
 import Animation from './core/core.animation';
 import animator from './core/core.animator';
@@ -24,10 +25,9 @@ import * as scales from './scales';
 import Ticks from './core/core.ticks';
 
 // Register built-ins
-// @ts-ignore
 Chart.register(controllers, scales, elements, plugins);
 
-Chart.helpers = helpers;
+Chart.helpers = {...helpers};
 Chart._adapters = _adapters;
 Chart.Animation = Animation;
 Chart.Animations = Animations;
@@ -47,7 +47,6 @@ Object.assign(Chart, controllers, scales, elements, plugins, platforms);
 Chart.Chart = Chart;
 
 if (typeof window !== 'undefined') {
-	// @ts-ignore
 	window.Chart = Chart;
 }
 
diff --git a/src/platform/platform.base.js b/src/platform/platform.base.js
index 434ede1c780..9baea172f25 100644
--- a/src/platform/platform.base.js
+++ b/src/platform/platform.base.js
@@ -49,6 +49,22 @@ export default class BasePlatform {
 		return 1;
 	}
 
+	/**
+	 * Returns the maximum size in pixels of given canvas element.
+	 * @param {HTMLCanvasElement} element
+	 * @param {number} [width] - content width of parent element
+	 * @param {number} [height] - content height of parent element
+	 * @param {number} [aspectRatio] - aspect ratio to maintain
+	 */
+	getMaximumSize(element, width, height, aspectRatio) {
+		width = Math.max(0, width || element.width);
+		height = height || element.height;
+		return {
+			width,
+			height: Math.max(0, aspectRatio ? Math.floor(width / aspectRatio) : height)
+		};
+	}
+
 	/**
 	 * @param {HTMLCanvasElement} canvas
 	 * @returns {boolean} true if the canvas is attached to the platform, false if not.
diff --git a/src/platform/platform.dom.js b/src/platform/platform.dom.js
index 1b2eb28810e..24068924fef 100644
--- a/src/platform/platform.dom.js
+++ b/src/platform/platform.dom.js
@@ -3,7 +3,7 @@
  */
 
 import BasePlatform from './platform.base';
-import {_getParentNode, getRelativePosition, supportsEventListenerOptions, readUsedSize} from '../helpers/helpers.dom';
+import {_getParentNode, getRelativePosition, supportsEventListenerOptions, readUsedSize, getMaximumSize} from '../helpers/helpers.dom';
 import {throttled} from '../helpers/helpers.extras';
 import {isNullOrUndef} from '../helpers/helpers.core';
 
@@ -102,22 +102,18 @@ function removeListener(chart, type, listener) {
 	chart.canvas.removeEventListener(type, listener, eventListenerOptions);
 }
 
-function createEvent(type, chart, x, y, nativeEvent) {
+function fromNativeEvent(event, chart) {
+	const type = EVENT_TYPES[event.type] || event.type;
+	const {x, y} = getRelativePosition(event, chart);
 	return {
 		type,
 		chart,
-		native: nativeEvent || null,
+		native: event,
 		x: x !== undefined ? x : null,
 		y: y !== undefined ? y : null,
 	};
 }
 
-function fromNativeEvent(event, chart) {
-	const type = EVENT_TYPES[event.type] || event.type;
-	const pos = getRelativePosition(event, chart);
-	return createEvent(type, chart, pos.x, pos.y, event);
-}
-
 function createAttachObserver(chart, type, listener) {
 	const canvas = chart.canvas;
 	const container = canvas && _getParentNode(canvas);
@@ -245,7 +241,10 @@ function createProxyAndListen(chart, type, listener) {
 		if (chart.ctx !== null) {
 			listener(fromNativeEvent(event, chart));
 		}
-	}, chart);
+	}, chart, (args) => {
+		const event = args[0];
+		return [event, event.offsetX, event.offsetY];
+	});
 
 	addListener(canvas, type, proxy);
 
@@ -368,6 +367,15 @@ export default class DomPlatform extends BasePlatform {
 		return window.devicePixelRatio;
 	}
 
+	/**
+	 * @param {HTMLCanvasElement} canvas
+	 * @param {number} [width] - content width of parent element
+	 * @param {number} [height] - content height of parent element
+	 * @param {number} [aspectRatio] - aspect ratio to maintain
+	 */
+	getMaximumSize(canvas, width, height, aspectRatio) {
+		return getMaximumSize(canvas, width, height, aspectRatio);
+	}
 
 	/**
 	 * @param {HTMLCanvasElement} canvas
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 99f5b941252..f8ad236b166 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -1,6 +1,6 @@
 import adapters from '../core/core.adapters';
 import {isFinite, isNullOrUndef, mergeIf, valueOrDefault} from '../helpers/helpers.core';
-import {toRadians} from '../helpers/helpers.math';
+import {toRadians, isNumber} from '../helpers/helpers.math';
 import Scale from '../core/core.scale';
 import {_arrayUnique, _filterBetween, _lookup} from '../helpers/helpers.collection';
 
@@ -71,7 +71,7 @@ function parse(scale, input) {
 	}
 
 	if (round) {
-		value = round === 'week' && isoWeekday
+		value = round === 'week' && (isNumber(isoWeekday) || isoWeekday === true)
 			? scale._adapter.startOf(value, 'isoWeek', isoWeekday)
 			: scale._adapter.startOf(value, round);
 	}
@@ -135,17 +135,18 @@ function determineMajorUnit(unit) {
 }
 
 /**
- * @param {number[]} timestamps
  * @param {object} ticks
  * @param {number} time
+ * @param {number[]} [timestamps] - if defined, snap to these timestamps
  */
-function addTick(timestamps, ticks, time) {
-	if (!timestamps.length) {
-		return;
+function addTick(ticks, time, timestamps) {
+	if (!timestamps) {
+		ticks[time] = true;
+	} else if (timestamps.length) {
+		const {lo, hi} = _lookup(timestamps, time);
+		const timestamp = timestamps[lo] >= time ? timestamps[lo] : timestamps[hi];
+		ticks[timestamp] = true;
 	}
-	const {lo, hi} = _lookup(timestamps, time);
-	const timestamp = timestamps[lo] >= time ? timestamps[lo] : timestamps[hi];
-	ticks[timestamp] = true;
 }
 
 /**
@@ -399,45 +400,35 @@ export default class TimeScale extends Scale {
 		const minor = timeOpts.unit || determineUnitForAutoTicks(timeOpts.minUnit, min, max, me._getLabelCapacity(min));
 		const stepSize = valueOrDefault(timeOpts.stepSize, 1);
 		const weekday = minor === 'week' ? timeOpts.isoWeekday : false;
+		const hasWeekday = isNumber(weekday) || weekday === true;
 		const ticks = {};
 		let first = min;
 		let time;
 
 		// For 'week' unit, handle the first day of week option
-		if (weekday) {
+		if (hasWeekday) {
 			first = +adapter.startOf(first, 'isoWeek', weekday);
 		}
 
 		// Align first ticks on unit
-		first = +adapter.startOf(first, weekday ? 'day' : minor);
+		first = +adapter.startOf(first, hasWeekday ? 'day' : minor);
 
 		// Prevent browser from freezing in case user options request millions of milliseconds
 		if (adapter.diff(max, min, minor) > 100000 * stepSize) {
 			throw new Error(min + ' and ' + max + ' are too far apart with stepSize of ' + stepSize + ' ' + minor);
 		}
 
-		if (me.options.ticks.source === 'data') {
-			// need to make sure ticks are in data in this case
-			const timestamps = me.getDataTimestamps();
-
-			for (time = first; time < max; time = +adapter.add(time, stepSize, minor)) {
-				addTick(timestamps, ticks, time);
-			}
-
-			if (time === max || options.bounds === 'ticks') {
-				addTick(timestamps, ticks, time);
-			}
-		} else {
-			for (time = first; time < max; time = +adapter.add(time, stepSize, minor)) {
-				ticks[time] = true;
-			}
+		const timestamps = options.ticks.source === 'data' && me.getDataTimestamps();
+		for (time = first; time < max; time = +adapter.add(time, stepSize, minor)) {
+			addTick(ticks, time, timestamps);
+		}
 
-			if (time === max || options.bounds === 'ticks') {
-				ticks[time] = true;
-			}
+		if (time === max || options.bounds === 'ticks') {
+			addTick(ticks, time, timestamps);
 		}
 
-		return Object.keys(ticks).map(x => +x);
+		// @ts-ignore
+		return Object.keys(ticks).sort((a, b) => a - b).map(x => +x);
 	}
 
 	/**
diff --git a/test/fixtures/scale.time/negative-times.js b/test/fixtures/scale.time/negative-times.js
new file mode 100644
index 00000000000..a1863336d07
--- /dev/null
+++ b/test/fixtures/scale.time/negative-times.js
@@ -0,0 +1,35 @@
+module.exports = {
+	config: {
+		type: 'line',
+		data: {
+			datasets: [{
+				data: [
+					{x: -1000000, y: 1},
+					{x: 1000000000, y: 2}
+				]
+			}]
+		},
+		options: {
+			scales: {
+				x: {
+					type: 'time',
+					time: {
+						unit: 'day'
+					},
+					ticks: {
+						display: false
+					}
+				},
+				y: {
+					ticks: {
+						display: false
+					}
+				}
+			},
+			legend: false
+		}
+	},
+	options: {
+		canvas: {width: 1000, height: 200}
+	}
+};
diff --git a/test/fixtures/scale.time/negative-times.png b/test/fixtures/scale.time/negative-times.png
new file mode 100644
index 00000000000..b7453937b51
Binary files /dev/null and b/test/fixtures/scale.time/negative-times.png differ
diff --git a/test/fixtures/scale.time/source-labels-linear-offset-min-max.png b/test/fixtures/scale.time/source-labels-linear-offset-min-max.png
index 47463888222..29fae000ff0 100644
Binary files a/test/fixtures/scale.time/source-labels-linear-offset-min-max.png and b/test/fixtures/scale.time/source-labels-linear-offset-min-max.png differ
diff --git a/test/fixtures/scale.time/ticks-reverse-linear-min-max.png b/test/fixtures/scale.time/ticks-reverse-linear-min-max.png
index 8da6a228a80..dbdfa5ed0a5 100644
Binary files a/test/fixtures/scale.time/ticks-reverse-linear-min-max.png and b/test/fixtures/scale.time/ticks-reverse-linear-min-max.png differ
diff --git a/test/fixtures/scale.time/ticks-reverse-linear.png b/test/fixtures/scale.time/ticks-reverse-linear.png
index ec0e7be0916..b229b778528 100644
Binary files a/test/fixtures/scale.time/ticks-reverse-linear.png and b/test/fixtures/scale.time/ticks-reverse-linear.png differ
diff --git a/test/specs/core.controller.tests.js b/test/specs/core.controller.tests.js
index e733d6a6bd3..12045a78715 100644
--- a/test/specs/core.controller.tests.js
+++ b/test/specs/core.controller.tests.js
@@ -637,6 +637,7 @@ describe('Chart', function() {
 				dw: 0, dh: 0,
 				rw: 0, rh: 0,
 			});
+			expect(chart.chartArea).toBeUndefined();
 
 			waitForResize(chart, function() {
 				expect(chart).toBeChartOfSize({
@@ -644,6 +645,8 @@ describe('Chart', function() {
 					rw: 455, rh: 355,
 				});
 
+				expect(chart.chartArea).not.toBeUndefined();
+
 				body.removeChild(wrapper);
 				chart.destroy();
 				done();
diff --git a/test/specs/core.datasetController.tests.js b/test/specs/core.datasetController.tests.js
index 1da76a5d5d8..4e375df3a1b 100644
--- a/test/specs/core.datasetController.tests.js
+++ b/test/specs/core.datasetController.tests.js
@@ -624,43 +624,82 @@ describe('Chart.DatasetController', function() {
 			// Remove test from global defaults
 			delete Chart.defaults.elements.line.globalTest;
 		});
-	});
 
-	it('should resove names in object notation', function() {
-		Chart.defaults.elements.line.global = 'global';
+		it('should resove names in object notation', function() {
+			Chart.defaults.elements.line.global = 'global';
 
-		const chart = acquireChart({
-			type: 'line',
-			data: {
-				datasets: [{
-					data: [1],
-					datasetTest: 'dataset'
-				}]
-			},
-			options: {
-				elements: {
-					line: {
-						element: 'element'
+			const chart = acquireChart({
+				type: 'line',
+				data: {
+					datasets: [{
+						data: [1],
+						datasetTest: 'dataset'
+					}]
+				},
+				options: {
+					elements: {
+						line: {
+							element: 'element'
+						}
 					}
 				}
-			}
+			});
+
+			const controller = chart.getDatasetMeta(0).controller;
+
+			expect(controller._resolveOptions(
+				{
+					dataset: 'datasetTest',
+					element: 'elementTest',
+					global: 'globalTest'},
+				{type: 'line'})
+			).toEqual({
+				dataset: 'dataset',
+				element: 'element',
+				global: 'global'
+			});
+
+			// Remove test from global defaults
+			delete Chart.defaults.elements.line.global;
 		});
+	});
+
+	describe('_resolveAnimations', function() {
+		it('should resolve to empty Animations when globally disabled', function() {
+			const chart = acquireChart({
+				type: 'line',
+				data: {
+					datasets: [{
+						data: [1],
+						animation: {
+							test: {duration: 10}
+						}
+					}]
+				},
+				options: {
+					animation: false
+				}
+			});
 
-		const controller = chart.getDatasetMeta(0).controller;
-
-		expect(controller._resolveOptions(
-			{
-				dataset: 'datasetTest',
-				element: 'elementTest',
-				global: 'globalTest'},
-			{type: 'line'})
-		).toEqual({
-			dataset: 'dataset',
-			element: 'element',
-			global: 'global'
+			const controller = chart.getDatasetMeta(0).controller;
+
+			expect(controller._resolveAnimations(0)._properties.size).toEqual(0);
 		});
 
-		// Remove test from global defaults
-		delete Chart.defaults.elements.line.global;
+		it('should resolve to empty Animations when disabled at dataset level', function() {
+			const chart = acquireChart({
+				type: 'line',
+				data: {
+					datasets: [{
+						data: [1],
+						animation: false
+					}]
+				}
+			});
+
+			const controller = chart.getDatasetMeta(0).controller;
+
+			expect(controller._resolveAnimations(0)._properties.size).toEqual(0);
+		});
 	});
 });
diff --git a/test/specs/helpers.canvas.tests.js b/test/specs/helpers.canvas.tests.js
index d258a2fabab..031491b0d2b 100644
--- a/test/specs/helpers.canvas.tests.js
+++ b/test/specs/helpers.canvas.tests.js
@@ -1,7 +1,7 @@
 'use strict';
 
 describe('Chart.helpers.canvas', function() {
-	describe('auto', jasmine.fixture.specs('helpers.canvas'));
+	describe('auto', jasmine.fixture.specs('helpers'));
 
 	var helpers = Chart.helpers;
 
@@ -15,7 +15,7 @@ describe('Chart.helpers.canvas', function() {
 
 			spyOn(chart.ctx, 'clearRect');
 
-			helpers.canvas.clear(chart);
+			helpers.clear(chart);
 
 			expect(chart.ctx.clearRect.calls.count()).toBe(1);
 			expect(chart.ctx.clearRect.calls.first().object).toBe(chart.ctx);
@@ -25,7 +25,7 @@ describe('Chart.helpers.canvas', function() {
 
 	describe('isPointInArea', function() {
 		it('should determine if a point is in the area', function() {
-			var isPointInArea = helpers.canvas._isPointInArea;
+			var isPointInArea = helpers._isPointInArea;
 			var area = {left: 0, top: 0, right: 512, bottom: 256};
 
 			expect(isPointInArea({x: 0, y: 0}, area)).toBe(true);
@@ -45,8 +45,8 @@ describe('Chart.helpers.canvas', function() {
 
 
 		// Regardless 'FooBar' is the longest label it should return (characters * 10)
-		expect(helpers.canvas._longestText(context, font, arrayOfThings1D, {})).toEqual(60);
-		expect(helpers.canvas._longestText(context, font, arrayOfThings2D, {})).toEqual(80);
+		expect(helpers._longestText(context, font, arrayOfThings1D, {})).toEqual(60);
+		expect(helpers._longestText(context, font, arrayOfThings2D, {})).toEqual(80);
 		// We check to make sure we made the right calls to the canvas.
 		expect(context.getCalls()).toEqual([{
 			name: 'save',
@@ -84,9 +84,9 @@ describe('Chart.helpers.canvas', function() {
 		var gc = [];
 		var longest = 70;
 
-		expect(helpers.canvas._measureText(context, data, gc, longest, 'foobar')).toEqual(70);
-		expect(helpers.canvas._measureText(context, data, gc, longest, 'foobar_')).toEqual(70);
-		expect(helpers.canvas._measureText(context, data, gc, longest, 'foobar_1')).toEqual(80);
+		expect(helpers._measureText(context, data, gc, longest, 'foobar')).toEqual(70);
+		expect(helpers._measureText(context, data, gc, longest, 'foobar_')).toEqual(70);
+		expect(helpers._measureText(context, data, gc, longest, 'foobar_1')).toEqual(80);
 		// We check to make sure we made the right calls to the canvas.
 		expect(context.getCalls()).toEqual([{
 			name: 'measureText',
diff --git a/test/specs/helpers.collection.tests.js b/test/specs/helpers.collection.tests.js
index 3f3e0eebd2d..cae35c200d7 100644
--- a/test/specs/helpers.collection.tests.js
+++ b/test/specs/helpers.collection.tests.js
@@ -1,4 +1,4 @@
-const {_filterBetween, _lookup, _lookupByKey, _rlookupByKey} = Chart.helpers.collection;
+const {_filterBetween, _lookup, _lookupByKey, _rlookupByKey} = Chart.helpers;
 
 describe('helpers.collection', function() {
 	it('Should do binary search', function() {
diff --git a/test/specs/helpers.curve.tests.js b/test/specs/helpers.curve.tests.js
index d0f4e7115f6..1b888e986f2 100644
--- a/test/specs/helpers.curve.tests.js
+++ b/test/specs/helpers.curve.tests.js
@@ -2,7 +2,7 @@ describe('Curve helper tests', function() {
 	let helpers;
 
 	beforeAll(function() {
-		helpers = window.Chart.helpers.curve;
+		helpers = window.Chart.helpers;
 	});
 
 	it('should spline curves', function() {
diff --git a/test/specs/helpers.dom.tests.js b/test/specs/helpers.dom.tests.js
index ab614deeea1..81e17d7e266 100644
--- a/test/specs/helpers.dom.tests.js
+++ b/test/specs/helpers.dom.tests.js
@@ -2,10 +2,10 @@ describe('DOM helpers tests', function() {
 	let helpers;
 
 	beforeAll(function() {
-		helpers = window.Chart.helpers.dom;
+		helpers = window.Chart.helpers;
 	});
 
-	it ('should get the maximum width and height for a node', function() {
+	it ('should get the maximum size for a node', function() {
 		// Create div with fixed size as a test bed
 		var div = document.createElement('div');
 		div.style.width = '200px';
@@ -17,8 +17,7 @@ describe('DOM helpers tests', function() {
 		var innerDiv = document.createElement('div');
 		div.appendChild(innerDiv);
 
-		expect(helpers.getMaximumWidth(innerDiv)).toBe(200);
-		expect(helpers.getMaximumHeight(innerDiv)).toBe(300);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({width: 200, height: 300}));
 
 		document.body.removeChild(div);
 	});
@@ -42,8 +41,7 @@ describe('DOM helpers tests', function() {
 		var innerDiv = document.createElement('div');
 		shadow.appendChild(innerDiv);
 
-		expect(helpers.getMaximumWidth(innerDiv)).toBe(200);
-		expect(helpers.getMaximumHeight(innerDiv)).toBe(300);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({width: 200, height: 300}));
 
 		document.body.removeChild(div);
 	});
@@ -61,7 +59,7 @@ describe('DOM helpers tests', function() {
 		innerDiv.style.maxWidth = '150px';
 		div.appendChild(innerDiv);
 
-		expect(helpers.getMaximumWidth(innerDiv)).toBe(150);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({width: 150}));
 
 		document.body.removeChild(div);
 	});
@@ -79,7 +77,7 @@ describe('DOM helpers tests', function() {
 		innerDiv.style.maxHeight = '150px';
 		div.appendChild(innerDiv);
 
-		expect(helpers.getMaximumHeight(innerDiv)).toBe(150);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({height: 150}));
 
 		document.body.removeChild(div);
 	});
@@ -101,7 +99,7 @@ describe('DOM helpers tests', function() {
 		var innerDiv = document.createElement('div');
 		parentDiv.appendChild(innerDiv);
 
-		expect(helpers.getMaximumWidth(innerDiv)).toBe(150);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({width: 150}));
 
 		document.body.removeChild(div);
 	});
@@ -124,7 +122,7 @@ describe('DOM helpers tests', function() {
 		innerDiv.style.height = '300px'; // make it large
 		parentDiv.appendChild(innerDiv);
 
-		expect(helpers.getMaximumHeight(innerDiv)).toBe(150);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({height: 150}));
 
 		document.body.removeChild(div);
 	});
@@ -142,12 +140,12 @@ describe('DOM helpers tests', function() {
 		innerDiv.style.maxWidth = '50%';
 		div.appendChild(innerDiv);
 
-		expect(helpers.getMaximumWidth(innerDiv)).toBe(100);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({width: 100}));
 
 		document.body.removeChild(div);
 	});
 
-	it ('should get the maximum height of a node that has a percentage max-height style', function() {
+	it('should get the maximum height of a node that has a percentage max-height style', function() {
 		// Create div with fixed size as a test bed
 		var div = document.createElement('div');
 		div.style.width = '200px';
@@ -160,7 +158,7 @@ describe('DOM helpers tests', function() {
 		innerDiv.style.maxHeight = '50%';
 		div.appendChild(innerDiv);
 
-		expect(helpers.getMaximumHeight(innerDiv)).toBe(150);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({height: 150}));
 
 		document.body.removeChild(div);
 	});
@@ -182,7 +180,7 @@ describe('DOM helpers tests', function() {
 		var innerDiv = document.createElement('div');
 		parentDiv.appendChild(innerDiv);
 
-		expect(helpers.getMaximumWidth(innerDiv)).toBe(100);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({width: 100}));
 
 		document.body.removeChild(div);
 	});
@@ -204,7 +202,7 @@ describe('DOM helpers tests', function() {
 		innerDiv.style.height = '300px'; // make it large
 		parentDiv.appendChild(innerDiv);
 
-		expect(helpers.getMaximumHeight(innerDiv)).toBe(150);
+		expect(helpers.getMaximumSize(innerDiv)).toEqual(jasmine.objectContaining({height: 150}));
 
 		document.body.removeChild(div);
 	});
@@ -226,15 +224,15 @@ describe('DOM helpers tests', function() {
 		innerDiv.appendChild(canvas);
 
 		// No padding
-		expect(helpers.getMaximumWidth(canvas)).toBe(300);
+		expect(helpers.getMaximumSize(canvas)).toEqual(jasmine.objectContaining({width: 300}));
 
 		// test with percentage
 		innerDiv.style.padding = '5%';
-		expect(helpers.getMaximumWidth(canvas)).toBe(270);
+		expect(helpers.getMaximumSize(canvas)).toEqual(jasmine.objectContaining({width: 270}));
 
 		// test with pixels
 		innerDiv.style.padding = '10px';
-		expect(helpers.getMaximumWidth(canvas)).toBe(280);
+		expect(helpers.getMaximumSize(canvas)).toEqual(jasmine.objectContaining({width: 280}));
 
 		document.body.removeChild(div);
 	});
@@ -256,4 +254,99 @@ describe('DOM helpers tests', function() {
 		expect(canvas.style.width).toBe('400px');
 	});
 
+	describe('getRelativePosition', function() {
+		it('should use offsetX/Y when available', function() {
+			const event = {offsetX: 50, offsetY: 100};
+			const chart = window.acquireChart({}, {
+				canvas: {
+					height: 200,
+					width: 200,
+				}
+			});
+			expect(helpers.getRelativePosition(event, chart)).toEqual({x: 50, y: 100});
+
+			const chart2 = window.acquireChart({}, {
+				canvas: {
+					height: 200,
+					width: 200,
+					style: 'padding: 10px'
+				}
+			});
+			expect(helpers.getRelativePosition(event, chart2)).toEqual({
+				x: Math.round((event.offsetX - 10) / 180 * 200),
+				y: Math.round((event.offsetY - 10) / 180 * 200)
+			});
+
+			const chart3 = window.acquireChart({}, {
+				canvas: {
+					height: 200,
+					width: 200,
+					style: 'width: 400px, height: 400px; padding: 10px'
+				}
+			});
+			expect(helpers.getRelativePosition(event, chart3)).toEqual({
+				x: Math.round((event.offsetX - 10) / 360 * 400),
+				y: Math.round((event.offsetY - 10) / 360 * 400)
+			});
+
+			const chart4 = window.acquireChart({}, {
+				canvas: {
+					height: 200,
+					width: 200,
+					style: 'width: 400px, height: 400px; padding: 10px; position: absolute; left: 20, top: 20'
+				}
+			});
+			expect(helpers.getRelativePosition(event, chart4)).toEqual({
+				x: Math.round((event.offsetX - 10) / 360 * 400),
+				y: Math.round((event.offsetY - 10) / 360 * 400)
+			});
+
+		});
+
+		it('should calculate from clientX/Y as fallback', function() {
+			const chart = window.acquireChart({}, {
+				canvas: {
+					height: 200,
+					width: 200,
+				}
+			});
+
+			const event = {
+				clientX: 50,
+				clientY: 100
+			};
+
+			const rect = chart.canvas.getBoundingClientRect();
+			expect(helpers.getRelativePosition(event, chart)).toEqual({
+				x: Math.round(event.clientX - rect.x),
+				y: Math.round(event.clientY - rect.y)
+			});
+
+			const chart2 = window.acquireChart({}, {
+				canvas: {
+					height: 200,
+					width: 200,
+					style: 'padding: 10px'
+				}
+			});
+			const rect2 = chart2.canvas.getBoundingClientRect();
+			expect(helpers.getRelativePosition(event, chart2)).toEqual({
+				x: Math.round((event.clientX - rect2.x - 10) / 180 * 200),
+				y: Math.round((event.clientY - rect2.y - 10) / 180 * 200)
+			});
+
+			const chart3 = window.acquireChart({}, {
+				canvas: {
+					height: 200,
+					width: 200,
+					style: 'width: 400px, height: 400px; padding: 10px'
+				}
+			});
+			const rect3 = chart3.canvas.getBoundingClientRect();
+			expect(helpers.getRelativePosition(event, chart3)).toEqual({
+				x: Math.round((event.clientX - rect3.x - 10) / 360 * 400),
+				y: Math.round((event.clientY - rect3.y - 10) / 360 * 400)
+			});
+		});
+	});
 });
diff --git a/test/specs/helpers.easing.tests.js b/test/specs/helpers.easing.tests.js
index 50240c9dda9..cf5ac99c3e6 100644
--- a/test/specs/helpers.easing.tests.js
+++ b/test/specs/helpers.easing.tests.js
@@ -1,7 +1,7 @@
 'use strict';
 
-describe('Chart.helpers.easing', function() {
-	var easing = Chart.helpers.easing;
+describe('Chart.helpers.easingEffects', function() {
+	var helpers = Chart.helpers;
 
 	describe('effects', function() {
 		var expected = {
@@ -39,7 +39,7 @@ describe('Chart.helpers.easing', function() {
 		};
 
 		function generate(method) {
-			var fn = easing.effects[method];
+			var fn = helpers.easingEffects[method];
 			var accuracy = Math.pow(10, 8);
 			var count = 10;
 			var values = [];
@@ -52,7 +52,7 @@ describe('Chart.helpers.easing', function() {
 			return values;
 		}
 
-		Object.keys(easing.effects).forEach(function(method) {
+		Object.keys(helpers.easingEffects).forEach(function(method) {
 			it ('"' + method + '" should return expected values', function() {
 				expect(generate(method)).toEqual(expected[method]);
 			});
diff --git a/test/specs/helpers.interpolation.tests.js b/test/specs/helpers.interpolation.tests.js
index d138df1aa1e..22f8254a3f9 100644
--- a/test/specs/helpers.interpolation.tests.js
+++ b/test/specs/helpers.interpolation.tests.js
@@ -1,4 +1,4 @@
-const {_pointInLine, _steppedInterpolation, _bezierInterpolation} = Chart.helpers.interpolation;
+const {_pointInLine, _steppedInterpolation, _bezierInterpolation} = Chart.helpers;
 
 describe('helpers.interpolation', function() {
 	it('Should interpolate a point in line', function() {
diff --git a/test/specs/helpers.math.tests.js b/test/specs/helpers.math.tests.js
index afda1651334..c71902201b1 100644
--- a/test/specs/helpers.math.tests.js
+++ b/test/specs/helpers.math.tests.js
@@ -1,4 +1,4 @@
-const math = Chart.helpers.math;
+const math = Chart.helpers;
 
 describe('Chart.helpers.math', function() {
 	var factorize = math._factorize;
diff --git a/test/specs/helpers.options.tests.js b/test/specs/helpers.options.tests.js
index 07f78d0823a..f742b1bf548 100644
--- a/test/specs/helpers.options.tests.js
+++ b/test/specs/helpers.options.tests.js
@@ -1,4 +1,4 @@
-const {toLineHeight, toPadding, toFont, resolve} = Chart.helpers.options; // from '../../src/helpers/helpers.options';
+const {toLineHeight, toPadding, toFont, resolve} = Chart.helpers; // from '../../src/helpers/helpers.options';
 
 describe('Chart.helpers.options', function() {
 	describe('toLineHeight', function() {
diff --git a/test/specs/helpers.segment.tests.js b/test/specs/helpers.segment.tests.js
index 2900e7c3519..d1578733a7f 100644
--- a/test/specs/helpers.segment.tests.js
+++ b/test/specs/helpers.segment.tests.js
@@ -1,4 +1,4 @@
-const {_boundSegment} = Chart.helpers.segment;
+const {_boundSegment} = Chart.helpers;
 
 describe('helpers.segments', function() {
 	describe('_boundSegment', function() {
diff --git a/types/controllers/index.d.ts b/types/controllers/index.d.ts
index 8b88906334c..6482d11c87c 100644
--- a/types/controllers/index.d.ts
+++ b/types/controllers/index.d.ts
@@ -12,7 +12,6 @@ import {
   IPointPrefixedOptions,
   IRectangleOptions,
 } from '../elements';
-import { ICategoryScaleType, ILinearScaleType, IRadialLinearScaleType } from '../scales';
 
 export interface IControllerDatasetOptions {
   /**
@@ -80,10 +79,6 @@ export interface IBarControllerDatasetOptions
 }
 
 export interface IBarControllerChartOptions {
-  scales: {
-    _index_: ICategoryScaleType;
-    _value_: ILinearScaleType;
-  };
 }
 
 export interface BarController extends DatasetController {}
@@ -124,7 +119,8 @@ export interface ILineControllerDatasetOptions
   extends IControllerDatasetOptions,
     ScriptableAndArrayOptions<IPointPrefixedOptions>,
     ScriptableAndArrayOptions<IPointPrefixedHoverOptions>,
-    ScriptableOptions<ILineOptions> {
+    ScriptableOptions<ILineOptions>,
+    ScriptableOptions<ILineHoverOptions> {
   /**
    * The ID of the x axis to plot this dataset on.
    */
@@ -169,12 +165,7 @@ export interface IScatterDataPoint {
   y: number;
 }
 
-export interface IScatterControllerChartOptions extends ILineControllerChartOptions {
-  scales: {
-    x: ILinearScaleType;
-    y: ILinearScaleType;
-  };
-}
+export type IScatterControllerChartOptions = ILineControllerChartOptions;
 
 export interface ScatterController extends LineController {}
 export const ScatterController: IChartComponent & {
@@ -276,10 +267,6 @@ export interface IPolarAreaControllerChartOptions {
    */
   startAngle: number;
 
-  scales: {
-    r: IRadialLinearScaleType;
-  };
-
   animation: IPolarAreaAnimationOptions;
 }
 
diff --git a/types/core/index.d.ts b/types/core/index.d.ts
index 820d34e46ec..4a00823d4a2 100644
--- a/types/core/index.d.ts
+++ b/types/core/index.d.ts
@@ -10,7 +10,15 @@ import {
   TimeUnit,
   IEvent,
 } from './interfaces';
-import { IChartDataset, IChartConfiguration, ConfigurationOptions, ConfigurationData } from '../interfaces';
+import {
+  DefaultDataPoint,
+  IChartConfiguration,
+  IChartData,
+  IChartDataset,
+  IChartOptions,
+  IChartType,
+  IScaleOptions
+} from '../interfaces';
 
 export interface IDateAdapter {
   /**
@@ -232,28 +240,31 @@ export interface IParsingOptions {
     | false;
 }
 
-export interface Chart<
-  T = number,
-  L = string,
-  C extends IChartConfiguration<string, T, L> = IChartConfiguration<string, T, L>
+export declare class Chart<
+  TYPE extends IChartType = IChartType,
+  DATA extends unknown[] = DefaultDataPoint<TYPE>,
+  LABEL = string
 > {
   readonly platform: BasePlatform;
   readonly id: string;
   readonly canvas: HTMLCanvasElement;
   readonly ctx: CanvasRenderingContext2D;
-  readonly config: C;
+  readonly config: IChartConfiguration<TYPE, DATA, LABEL>
   readonly width: number;
   readonly height: number;
   readonly aspectRatio: number;
-  readonly options: ConfigurationOptions<C>;
   readonly boxes: ILayoutItem[];
   readonly currentDevicePixelRatio: number;
   readonly chartArea: IChartArea;
-  readonly data: ConfigurationData<C>;
   readonly scales: { [key: string]: Scale };
   readonly scale: Scale | undefined;
   readonly attached: boolean;
 
+  data: IChartData<TYPE, DATA, LABEL>;
+  options: IChartOptions<TYPE>;
+
+  constructor(item: ChartItem, config: IChartConfiguration<TYPE, DATA, LABEL>);
+
   clear(): this;
   stop(): this;
 
@@ -262,7 +273,7 @@ export interface Chart<
   buildOrUpdateScales(): void;
   buildOrUpdateControllers(): void;
   reset(): void;
-  update(mode?: string): void;
+  update(mode?: UpdateMode): void;
   render(): void;
   draw(): void;
 
@@ -287,6 +298,12 @@ export interface Chart<
   bindEvents(): void;
   unbindEvents(): void;
   updateHoverStyle(items: Element, mode: 'dataset', enabled: boolean): void;
+
+  static readonly version: string;
+  static readonly instances: { [key: string]: Chart };
+  static readonly registry: Registry;
+  static register(...items: IChartComponentLike[]): void;
+  static unregister(...items: IChartComponentLike[]): void;
 }
 
 export declare type ChartItem =
@@ -298,21 +315,17 @@ export declare type ChartItem =
   | { canvas: HTMLCanvasElement | OffscreenCanvas }
   | ArrayLike<CanvasRenderingContext2D | HTMLCanvasElement | OffscreenCanvas>;
 
-export const Chart: {
-  prototype: Chart;
-  new <T = number, L = string, C extends IChartConfiguration<string, T, L> = IChartConfiguration<string, T, L>>(
-    item: ChartItem,
-    config: C
-  ): Chart<T, L, C>;
-
-  readonly version: string;
-  readonly instances: { [key: string]: Chart };
-  readonly registry: Registry;
-  register(...items: IChartComponentLike[]): void;
-  unregister(...items: IChartComponentLike[]): void;
-};
+export enum UpdateModeEnum {
+  resize = 'resize',
+  reset = 'reset',
+  none = 'none',
+  hide = 'hide',
+  show = 'show',
+  normal = 'normal',
+  active = 'active'
+}
 
-export type UpdateMode = 'resize' | 'reset' | 'none' | 'hide' | 'show' | 'normal' | 'active' | undefined;
+export type UpdateMode = keyof typeof UpdateModeEnum;
 
 export class DatasetController<E extends Element = Element, DSE extends Element = Element> {
   constructor(chart: Chart, datasetIndex: number);
@@ -325,7 +338,7 @@ export class DatasetController<E extends Element = Element, DSE extends Element
   linkScales(): void;
   getAllParsedValues(scale: Scale): number[];
   protected getLabelAndValue(index: number): { label: string; value: string };
-  updateElements(elements: E[], start: number, mode: UpdateMode): void;
+  updateElements(elements: E[], start: number, count: number, mode: UpdateMode): void;
   update(mode: UpdateMode): void;
   updateIndex(datasetIndex: number): void;
   protected getMaxOverflow(): boolean | number;
@@ -346,7 +359,7 @@ export class DatasetController<E extends Element = Element, DSE extends Element
    * Utility for checking if the options are shared and should be animated separately.
    * @protected
    */
-  protected getSharedOptions(options: any): undefined | { any };
+  protected getSharedOptions(options: any): undefined | any;
   /**
    * Utility for determining if `options` should be included in the updated properties
    * @protected
@@ -823,7 +836,7 @@ export interface IPlugin<O = {}> {
   destroy?(chart: Chart, options: O): void;
 }
 
-declare type IChartComponentLike = IChartComponent | IChartComponent[] | { [key: string]: IChartComponent };
+export declare type IChartComponentLike = IChartComponent | IChartComponent[] | { [key: string]: IChartComponent };
 
 /**
  * Please use the module's default export which provides a singleton instance
@@ -857,7 +870,7 @@ export interface ITick {
   major?: boolean;
 }
 
-export interface IScaleOptions {
+export interface ICoreScaleOptions {
   /**
    * Controls the axis global visibility (visible when true, hidden when false). When display: 'auto', the axis is visible only if at least one associated dataset is visible.
    * @default true
@@ -931,7 +944,7 @@ export interface IScaleOptions {
   afterUpdate(axis: Scale): void;
 }
 
-export interface Scale<O extends IScaleOptions = IScaleOptions> extends Element<{}, O>, IChartArea {
+export interface Scale<O extends ICoreScaleOptions = ICoreScaleOptions> extends Element<{}, O>, IChartArea {
   readonly id: string;
   readonly type: string;
   readonly ctx: CanvasRenderingContext2D;
@@ -1046,7 +1059,7 @@ export interface Scale<O extends IScaleOptions = IScaleOptions> extends Element<
 }
 export const Scale: {
   prototype: Scale;
-  new <O extends IScaleOptions = IScaleOptions>(cfg: any): Scale<O>;
+  new <O extends ICoreScaleOptions = ICoreScaleOptions>(cfg: any): Scale<O>;
 };
 
 export interface IScriptAbleScaleContext {
diff --git a/types/elements/index.d.ts b/types/elements/index.d.ts
index 680ff7f83bc..c58795cc2b0 100644
--- a/types/elements/index.d.ts
+++ b/types/elements/index.d.ts
@@ -43,9 +43,15 @@ export interface IArcOptions extends ICommonOptions {
    * Arc stroke alignment.
    */
   borderAlign: 'center' | 'inner';
+  /**
+   * Arc offset (in pixels).
+   */
+  offset: number;
 }
 
-export interface IArcHoverOptions extends ICommonHoverOptions {}
+export interface IArcHoverOptions extends ICommonHoverOptions {
+  hoverOffset: number;
+}
 
 export interface Arc<T extends IArcProps = IArcProps, O extends IArcOptions = IArcOptions>
   extends Element<T, O>,
@@ -91,7 +97,7 @@ export interface ILineOptions extends ICommonOptions {
   cubicInterpolationMode: 'default' | 'monotone';
   /**
    * Bézier curve tension (0 for no Bézier curves).
-   * @default 0.4 or 0 // TODO
+   * @default 0
    */
   tension: number;
   /**
diff --git a/types/helpers/helpers.dom.d.ts b/types/helpers/helpers.dom.d.ts
index dbb722243a8..32ad47783f4 100644
--- a/types/helpers/helpers.dom.d.ts
+++ b/types/helpers/helpers.dom.d.ts
@@ -1,5 +1,4 @@
-export function getMaximumHeight(node: HTMLElement): number;
-export function getMaximumWidth(node: HTMLElement): number;
+export function getMaximumSize(node: HTMLElement, width?: number, height?: number, aspectRatio?: number): { width: number, height: number };
 export function getRelativePosition(
   evt: MouseEvent,
   chart: { readonly canvas: HTMLCanvasElement }
diff --git a/types/helpers/helpers.easing.d.ts b/types/helpers/helpers.easing.d.ts
index 4f67136afc0..7935bf52d7c 100644
--- a/types/helpers/helpers.easing.d.ts
+++ b/types/helpers/helpers.easing.d.ts
@@ -2,4 +2,4 @@ import { EasingFunction } from '../core/interfaces';
 
 export type EasingFunctionSignature = (t: number) => number;
 
-export const easing: Record<EasingFunction, EasingFunctionSignature>;
+export const easingEffects: Record<EasingFunction, EasingFunctionSignature>;
diff --git a/types/interfaces.d.ts b/types/interfaces.d.ts
index 66e925ac997..29a7e6bcd44 100644
--- a/types/interfaces.d.ts
+++ b/types/interfaces.d.ts
@@ -28,8 +28,14 @@ import {
   ILegendChartOptions,
   ITitleChartOptions,
 } from './plugins';
-import { IChartAnimationOptions, IParsingOptions } from './core';
-import { IScaleChartOptions } from './scales';
+import { IChartAnimationOptions, IParsingOptions, IPlugin } from './core';
+import {
+  ILinearScaleOptions,
+  ILogarithmicScaleOptions,
+  ICategoryScaleOptions,
+  IRadialLinearScaleOptions,
+  ITimeScaleOptions,
+} from './scales';
 
 export type DeepPartial<T> = T extends {}
   ? {
@@ -37,111 +43,172 @@ export type DeepPartial<T> = T extends {}
     }
   : T;
 
-export type IChartDataset<T = number, O = {}> = DeepPartial<IControllerDatasetOptions & IParsingOptions & O> & {
-  data: T[];
-};
+export type DistributiveArray<T> = T extends unknown ? T[] : never
 
-export type IBarControllerDataset<T = number> = IChartDataset<T, IBarControllerDatasetOptions>;
-export type ILineControllerDataset<T = IScatterDataPoint> = IChartDataset<
-  T,
-  ILineControllerDatasetOptions & IFillerControllerDatasetOptions
->;
-export type IScatterControllerDataset<T = IScatterDataPoint> = IChartDataset<T, IScatterControllerDatasetOptions>;
-export type IBubbleControllerDataset<T = IBubbleDataPoint> = IChartDataset<T, IBubbleControllerDatasetOptions>;
-export type IPieControllerDataset<T = IPieDataPoint> = IChartDataset<T, IPieControllerDatasetOptions>;
-export type IDoughnutControllerDataset<T = IDoughnutDataPoint> = IChartDataset<T, IDoughnutControllerDatasetOptions>;
-export type IPolarAreaControllerDataset<T = number> = IChartDataset<T, IPolarAreaControllerDatasetOptions>;
-export type IRadarControllerDataset<T = number> = IChartDataset<T, IRadarControllerDatasetOptions>;
-
-export interface IChartData<T = number, L = string, DS extends IChartDataset<T> = IChartDataset<T>>
-  extends DeepPartial<IParsingOptions> {
-  labels: L[];
-  datasets: DS[];
+export enum ScaleTypeEnum {
+  linear = 'linear',
+  logarithmic = 'logarithmic',
+  category = 'category',
+  radialLinear = 'radialLinear',
+  time = 'time',
+  timeseries = 'timeseries',
 }
 
-export type IChartOptions<O = {}> = DeepPartial<
-  ICoreChartOptions &
-    ITooltipChartOptions &
-    ILegendChartOptions &
-    ITitleChartOptions &
-    IChartAnimationOptions &
-    IScaleChartOptions &
-    IElementChartOptions &
-    O
->;
+export type IScaleType = keyof typeof ScaleTypeEnum;
 
-export interface IChartConfiguration<
-  TYPE = string,
-  T = number,
-  L = string,
-  DS extends IChartDataset<T> = IChartDataset<T>,
-  O = {}
-> {
-  type: TYPE;
-  data: IChartData<T, L, DS>;
-  options?: IChartOptions<O>;
+export interface ICartesianScaleTypeRegistry {
+  linear: {
+    options: ILinearScaleOptions;
+  };
+  logarithmic: {
+    options: ILogarithmicScaleOptions;
+  };
+  category: {
+    options: ICategoryScaleOptions;
+  };
+  time: {
+    options: ITimeScaleOptions;
+  };
+  timeseries: {
+    options: ITimeScaleOptions;
+  };
 }
 
-export type IBarControllerConfiguration<T = number, L = string> = IChartConfiguration<
-  'bar',
-  T,
-  L,
-  IBarControllerDataset<T>,
-  IBarControllerChartOptions
->;
-export type ILineControllerConfiguration<T = IScatterDataPoint, L = string> = IChartConfiguration<
-  'line',
-  T,
-  L,
-  ILineControllerDataset<T>,
-  ILineControllerChartOptions
->;
-export type IScatterControllerConfiguration<T = IScatterDataPoint, L = string> = IChartConfiguration<
-  'scatter',
-  T,
-  L,
-  IScatterControllerDataset<T>,
-  IScatterControllerChartOptions
->;
-export type IBubbleControllerConfiguration<T = IBubbleDataPoint, L = string> = IChartConfiguration<
-  'bubble',
-  T,
-  L,
-  IBubbleControllerDataset<T>
->;
-export type IPieControllerConfiguration<T = IPieDataPoint, L = string> = IChartConfiguration<
-  'pie',
-  T,
-  L,
-  IPieControllerDataset<T>,
-  IPieControllerChartOptions
->;
-export type IDoughnutControllerConfiguration<T = IDoughnutDataPoint, L = string> = IChartConfiguration<
-  'doughnut',
-  T,
-  L,
-  IDoughnutControllerDataset<T>,
-  IDoughnutControllerChartOptions
+export interface IRadialScaleTypeRegistry {
+  radialLinear: {
+    options: IRadialLinearScaleOptions;
+  };
+}
+
+export interface IScaleTypeRegistry extends ICartesianScaleTypeRegistry, IRadialScaleTypeRegistry {
+}
+
+export enum ChartTypeEnum {
+  bar = 'bar',
+  bubble = 'bubble',
+  doughnut = 'doughnut',
+  line = 'line',
+  pie = 'pie',
+  polarArea = 'polarArea',
+  radar = 'radar',
+  scatter = 'scatter',
+}
+
+export type IChartType = keyof typeof ChartTypeEnum;
+
+export interface IChartTypeRegistry {
+  bar: {
+    chartOptions: IBarControllerChartOptions;
+    datasetOptions: IBarControllerDatasetOptions;
+    defaultDataPoint: number;
+    scales: keyof ICartesianScaleTypeRegistry;
+  };
+  line: {
+    chartOptions: ILineControllerChartOptions;
+    datasetOptions: ILineControllerDatasetOptions & IFillerControllerDatasetOptions;
+    defaultDataPoint: IScatterDataPoint;
+    scales: keyof ICartesianScaleTypeRegistry;
+  };
+  scatter: {
+    chartOptions: IScatterControllerChartOptions;
+    datasetOptions: IScatterControllerDatasetOptions;
+    defaultDataPoint: IScatterDataPoint;
+    scales: keyof ICartesianScaleTypeRegistry;
+  };
+  bubble: {
+    chartOptions: {};
+    datasetOptions: IBubbleControllerDatasetOptions;
+    defaultDataPoint: IBubbleDataPoint;
+    scales: keyof ICartesianScaleTypeRegistry;
+  };
+  pie: {
+    chartOptions: IPieControllerChartOptions;
+    datasetOptions: IPieControllerDatasetOptions;
+    defaultDataPoint: IPieDataPoint;
+    scales: keyof ICartesianScaleTypeRegistry;
+  };
+  doughnut: {
+    chartOptions: IDoughnutControllerChartOptions;
+    datasetOptions: IDoughnutControllerDatasetOptions;
+    defaultDataPoint: IDoughnutDataPoint;
+    scales: keyof ICartesianScaleTypeRegistry;
+  };
+  polarArea: {
+    chartOptions: IPolarAreaControllerChartOptions;
+    datasetOptions: IPolarAreaControllerDatasetOptions;
+    defaultDataPoint: number;
+    scales: keyof IRadialScaleTypeRegistry;
+  };
+  radar: {
+    chartOptions: IRadarControllerChartOptions;
+    datasetOptions: IRadarControllerDatasetOptions;
+    defaultDataPoint: number;
+    scales: keyof IRadialScaleTypeRegistry;
+  };
+}
+
+export type IScaleOptions<SCALES extends IScaleType = IScaleType> = DeepPartial<
+  { [key in IScaleType]: { type: key } & IScaleTypeRegistry[key]['options'] }[SCALES]
 >;
-export type IPolarAreaControllerConfiguration<T = number, L = string> = IChartConfiguration<
-  'polarArea',
-  T,
-  L,
-  IPolarAreaControllerDataset<T>,
-  IPolarAreaControllerChartOptions
+
+export type IDatasetChartOptions<TYPE extends IChartType = IChartType> = {
+  [key in TYPE]: {
+    datasets: IChartTypeRegistry[key]['datasetOptions'];
+  };
+};
+
+export type IScaleChartOptions<TYPE extends IChartType = IChartType> = {
+  scales: {
+    [key: string]: IScaleOptions<IChartTypeRegistry[TYPE]['scales']>;
+  };
+};
+
+export type IChartOptions<TYPE extends IChartType = IChartType> = DeepPartial<
+  ICoreChartOptions &
+  IParsingOptions &
+  ITooltipChartOptions &
+  ILegendChartOptions &
+  ITitleChartOptions &
+  IChartAnimationOptions &
+  IElementChartOptions &
+  IDatasetChartOptions<TYPE> &
+  IScaleChartOptions<TYPE> &
+  IChartTypeRegistry[TYPE]['chartOptions']
 >;
-export type IRadarControllerConfiguration<T = number, L = string> = IChartConfiguration<
-  'radar',
-  T,
-  L,
-  IRadarControllerDataset<T>,
-  IRadarControllerChartOptions
+
+export type DefaultDataPoint<TYPE extends IChartType> = IChartType extends TYPE ? unknown[] : DistributiveArray<
+  IChartTypeRegistry[TYPE]['defaultDataPoint']
 >;
 
-export type ConfigurationOptions<O> = O extends IChartConfiguration<unknown, unknown, unknown, infer O> ? O : never;
-export type ConfigurationData<O> = O extends IChartConfiguration<unknown, infer T, infer L, infer DS, unknown>
-  ? IChartData<T, L, DS>
-  : never;
-export type ConfigurationDataset<O> = O extends IChartConfiguration<unknown, unknown, unknown, infer DS, unknown>
-  ? DS
-  : never;
+export interface IChartDatasetProperties<TYPE extends IChartType, DATA extends unknown[]> {
+  type?: TYPE;
+  data: DATA;
+}
+
+export type IChartDataset<
+  TYPE extends IChartType = IChartType,
+  DATA extends unknown[] = DefaultDataPoint<TYPE>
+> = DeepPartial<
+  IParsingOptions &
+  { [key in IChartType]: { type: key } & IChartTypeRegistry[key]['datasetOptions'] }[TYPE]
+> & IChartDatasetProperties<TYPE, DATA>;
+
+export interface IChartData<
+  TYPE extends IChartType = IChartType,
+  DATA extends unknown[] = DefaultDataPoint<TYPE>,
+  LABEL = string
+> {
+  labels: LABEL[];
+  datasets: IChartDataset<TYPE, DATA>[];
+}
+
+export interface IChartConfiguration<
+  TYPE extends IChartType = IChartType,
+  DATA extends unknown[] = DefaultDataPoint<TYPE>,
+  LABEL = string
+> {
+  type: TYPE;
+  data: IChartData<TYPE, DATA, LABEL>;
+  options?: IChartOptions<TYPE>;
+  plugins?: IPlugin[];
+}
diff --git a/types/platform/index.d.ts b/types/platform/index.d.ts
index 1980b57d060..64423db100b 100644
--- a/types/platform/index.d.ts
+++ b/types/platform/index.d.ts
@@ -38,6 +38,14 @@ export class BasePlatform {
    * @returns {number} the current devicePixelRatio of the device this platform is connected to.
    */
   getDevicePixelRatio(): number;
+  /**
+   * @param {HTMLCanvasElement} canvas - The canvas for which to calculate the maximum size
+   * @param {number} [width] - Parent element's content width
+   * @param {number} [height] - Parent element's content height
+   * @param {number} [aspectRatio] - The aspect ratio to maintain
+   * @returns { width: number, height: number } the maximum size available.
+   */
+  getMaximumSize(canvas: HTMLCanvasElement, width?: number, height?: number, aspectRatio?: number): { width: number, height: number };
   /**
    * @param {HTMLCanvasElement} canvas
    * @returns {boolean} true if the canvas is attached to the platform, false if not.
diff --git a/types/plugins/index.d.ts b/types/plugins/index.d.ts
index 12243491cd7..fa7878071dd 100644
--- a/types/plugins/index.d.ts
+++ b/types/plugins/index.d.ts
@@ -1,7 +1,7 @@
 import { Chart, Element, IAnimationSpecContainer, InteractionMode, LayoutPosition, IPlugin } from '../core';
-import { Color, IChartArea, IFontSpec, Scriptable, TextAlign, IEvent } from '../core/interfaces';
+import { Color, IChartArea, IFontSpec, Scriptable, TextAlign, IEvent, IHoverInteractionOptions } from '../core/interfaces';
 import { PointStyle } from '../elements';
-import { IChartData } from '../interfaces';
+import { IChartData, IChartDataset } from '../interfaces';
 
 export const Filler: IPlugin;
 
@@ -9,7 +9,7 @@ export interface IFillerOptions {
   propagate: boolean;
 }
 
-export type FillTarget = number | string | 'start' | 'end' | 'origin' | false;
+export type FillTarget = number | string | 'start' | 'end' | 'origin' | 'stack' | false;
 
 export interface IFillTarget {
   /**
@@ -325,7 +325,7 @@ export interface ITooltipPlugin<O = {}> {
   afterTooltipDraw?(chart: Chart, args: { tooltip: TooltipModel }, options: O): void;
 }
 
-export interface ITooltipOptions {
+export interface ITooltipOptions extends IHoverInteractionOptions {
   /**
    * Are on-canvas tooltips enabled?
    * @default true
@@ -335,18 +335,10 @@ export interface ITooltipOptions {
    * 	See custom tooltip section.
    */
   custom(this: TooltipModel, args: { chart: Chart; tooltip: TooltipModel }): void;
-  /**
-   * Sets which elements appear in the tooltip.
-   */
-  mode: InteractionMode;
   /**
    * The mode for positioning the tooltip
    */
   position: 'average' | 'nearest';
-  /**
-   * If true, the tooltip mode applies only when the mouse position intersects with an element. If false, the mode will be applied at all times.
-   */
-  intersect: boolean;
 
   /**
    * Sort tooltip items.
@@ -514,7 +506,7 @@ export interface ITooltipItem {
   /**
    * The dataset the item comes from
    */
-  dataset: object;
+  dataset: IChartDataset;
 
   /**
    * Index of the dataset the item comes from
diff --git a/types/scales/index.d.ts b/types/scales/index.d.ts
index 31f994688c7..68211674392 100644
--- a/types/scales/index.d.ts
+++ b/types/scales/index.d.ts
@@ -1,6 +1,5 @@
-import { ScriptAbleScale, IScaleOptions, ITick, Scale } from '../core';
+import { ScriptAbleScale, ICoreScaleOptions, ITick, Scale } from '../core';
 import { Color, IChartComponent, IFontSpec, TimeUnit } from '../core/interfaces';
-import { DeepPartial } from '../interfaces';
 
 export interface IGridLineOptions {
   /**
@@ -85,7 +84,7 @@ export interface ITickOptions {
   };
 }
 
-export interface ICartesianScaleOptions extends IScaleOptions {
+export interface ICartesianScaleOptions extends ICoreScaleOptions {
   /**
    * Position of the axis.
    */
@@ -180,7 +179,7 @@ export const CategoryScale: IChartComponent & {
   new <O extends ICategoryScaleOptions = ICategoryScaleOptions>(cfg: any): CategoryScale<O>;
 };
 
-export type ILinearScaleOptions = IScaleOptions & {
+export type ILinearScaleOptions = ICartesianScaleOptions & {
   stacked?: boolean;
 
   /**
@@ -276,17 +275,22 @@ export type ITimeScaleOptions = ICartesianScaleOptions & {
      */
     round: false | TimeUnit;
     /**
-     * If true and the unit is set to 'week', then the first day of the week will be Monday. Otherwise, it will be Sunday.
+     * If boolean and true and the unit is set to 'week', then the first day of the week will be Monday. Otherwise, it will be Sunday.
+     * If `number`, the index of the first day of the week (0 - Sunday, 6 - Saturday).
      * @default false
      */
-    isoWeekday: false | string;
+    isoWeekday: false | number;
     /**
-     * 	Sets how different time units are displayed.
+     * Sets how different time units are displayed.
      * @see https://www.chartjs.org/docs/next/axes/cartesian/time#display-formats
      */
     displayFormats: {
       [key: string]: string;
     };
+    /**
+     * The format string to use for the tooltip.
+     */
+    tooltipFormat: string;
     /**
      * If defined, will force the unit to be a certain type. See Time Units section below for details.
      * @default false
@@ -337,7 +341,7 @@ export const TimeSeriesScale: IChartComponent & {
   new <O extends ITimeScaleOptions = ITimeScaleOptions>(cfg: any): TimeSeriesScale<O>;
 };
 
-export type IRadialLinearScaleOptions = IScaleOptions & {
+export type IRadialLinearScaleOptions = ICoreScaleOptions & {
   animate: boolean;
 
   angleLines: {
@@ -471,28 +475,3 @@ export const RadialLinearScale: IChartComponent & {
   prototype: RadialLinearScale;
   new <O extends IRadialLinearScaleOptions = IRadialLinearScaleOptions>(cfg: any): RadialLinearScale<O>;
 };
-
-export interface ILinearScaleType extends DeepPartial<ILinearScaleOptions> {
-  type: 'linear';
-}
-export interface ILogarithmicScaleType extends DeepPartial<ILogarithmicScaleOptions> {
-  type: 'logarithmic';
-}
-export interface ICategoryScaleType extends DeepPartial<ICategoryScaleOptions> {
-  type: 'category';
-}
-export interface IRadialLinearScaleType extends DeepPartial<IRadialLinearScaleOptions> {
-  type: 'radialLinear';
-}
-export interface ITimeScaleType extends DeepPartial<ITimeScaleOptions> {
-  type: 'time';
-}
-export interface ITimeSeriesScaleType extends DeepPartial<ITimeScaleOptions> {
-  type: 'timeseries';
-}
-
-export interface IScaleChartOptions {
-  scales: {
-    [key: string]: { type: string } & DeepPartial<IScaleOptions>;
-  };
-}