diff --git a/README.md b/README.md
index 7b9ca57..1696b5e 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ The `tiles` library allows a developer to extend a tiled layer with offline supp
 	require([
 		"esri/map", 
 		"tiles/offlineTilesEnabler"], 
-		function(Map,offlineTilesEnabler)
+		function(Map,OfflineTilesEnabler)
 	{
 		...
 	});
@@ -164,6 +164,7 @@ The `tiles` library allows a developer to extend a tiled layer with offline supp
 
 ```js
 	var basemapLayer = map.getLayer( map.layerIds[0] );
+	var offlineTilesEnabler = new OfflineTilesEnabler();
 	offlineTilesEnabler.extend(basemapLayer, function(success)
 	{
 		if(success)	{
diff --git a/lib/tiles/offlineTilesEnabler.js b/lib/tiles/offlineTilesEnabler.js
index 77b859a..2d9db21 100644
--- a/lib/tiles/offlineTilesEnabler.js
+++ b/lib/tiles/offlineTilesEnabler.js
@@ -3,14 +3,15 @@
 define([
     "dojo/query",
     "dojo/request",
+    "dojo/_base/declare",
     "esri/geometry",
     "tiles/base64utils",
     "tiles/dbStore",
     "tiles/tilingScheme",
     "tiles/FileSaver"
-    ], function(query, request, geometry,Base64Utils,DbStore,TilingScheme,FileSaver)
+    ], function(query, request, declare, geometry,Base64Utils,DbStore,TilingScheme,FileSaver)
     {
-        return {
+    return declare([],{
             /**
              * Utility method to get the basemap layer reference
              * @param map
@@ -446,6 +447,6 @@ define([
                     req.send(null);
                 };
             }
-        }
-    });
+    }); // declare
+}); // define
 
diff --git a/samples/tiles-indexed-db.html b/samples/tiles-indexed-db.html
index 5ff72d4..1ca0ef9 100644
--- a/samples/tiles-indexed-db.html
+++ b/samples/tiles-indexed-db.html
@@ -316,13 +316,15 @@ require(
 		Scalebar, esriUtils, geometry,
 		dom, on, query,
 		urlUtils, webMercatorUtils,
-		offlineTilesEnabler,debouncer,
+		OfflineTilesEnabler,debouncer,
 		domConstruct,BootstrapMap)
 	{
 		var scalebar;
 		var symbol;
         var orientationChange = false;
 
+        var offlineTilesEnabler = new OfflineTilesEnabler();
+
 		// Load web map when page loads
 		var urlObject = urlUtils.urlToObject(window.location.href);
 		var webmapid;
diff --git a/test/SpecRunner.offlineTilesEnabler.html b/test/SpecRunner.offlineTilesEnabler.html
index dcb05d7..36e3967 100755
--- a/test/SpecRunner.offlineTilesEnabler.html
+++ b/test/SpecRunner.offlineTilesEnabler.html
@@ -41,7 +41,7 @@
   		Scalebar, esriUtils, geometry, 
   		dom, on, query, 
   		urlUtils, webMercatorUtils, 
-  		offlineTilesEnabler,
+  		OfflineTilesEnabler,
   		domConstruct) 
   	{
         g_map = new Map("map", {
@@ -56,7 +56,7 @@
   		function test() 
   		{
   			g_basemapLayer = g_map.getLayer( g_map.layerIds[0] );
-  			g_offlineTilesEnabler = offlineTilesEnabler;
+  			g_offlineTilesEnabler = new OfflineTilesEnabler();
 
   			var jasmineEnv = jasmine.getEnv();
   			jasmineEnv.updateInterval = 1000;