diff --git a/addon/components/impagination-dataset.js b/addon/components/impagination-dataset.js
index 28d3345..d777f80 100644
--- a/addon/components/impagination-dataset.js
+++ b/addon/components/impagination-dataset.js
@@ -10,6 +10,7 @@ import EmberObject, {
   computed
 } from '@ember/object';
 import layout from '../templates/components/impagination-dataset';
+import Dataset from 'impagination';
 
 
 // TODO: Since `records` are wrapped in Ember.A() not all these methods are accurate
@@ -37,11 +38,11 @@ export default Component.extend({
   'on-init'() {},
   'on-observe'() {},
 
-  // Impagination Dataset Class: `app/components/impagination-dataset`
   Dataset: null,
 
   init() {
     this._super(...arguments);
+    this.set("Dataset", Dataset);
 
     let readOffsetAttrFound = get(this, 'read-offset') >= 0;
     warn('Ember Impagination: `read-offset` attribute has been removed. Please use the `on-init` function instead.', !readOffsetAttrFound, {id: 'ember-impagination.attributes.read-offset'});
diff --git a/app/components/impagination-dataset.js b/app/components/impagination-dataset.js
index 9e1e253..2cd6db5 100644
--- a/app/components/impagination-dataset.js
+++ b/app/components/impagination-dataset.js
@@ -1,4 +1 @@
-import Dataset from 'impagination';
-import EmberImpagination from 'ember-impagination/components/impagination-dataset';
-
-export default EmberImpagination.extend({ Dataset });
+export { default } from 'ember-impagination/components/impagination-dataset';
\ No newline at end of file
diff --git a/app/templates/components/impagination-dataset.js b/app/templates/components/impagination-dataset.js
deleted file mode 100644
index 140a877..0000000
--- a/app/templates/components/impagination-dataset.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-impagination/templates/components/impagination-dataset';