diff --git a/dist/facebook.js b/dist/facebook.js
index e8a1f6cf..5fe5f603 100644
--- a/dist/facebook.js
+++ b/dist/facebook.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/Facebook/index.js');
-delete global.__jaydataModuleRoot;
\ No newline at end of file
+module.exports = require('./lib/Types/StorageProviders/Facebook/index.js');
\ No newline at end of file
diff --git a/dist/indexeddb.js b/dist/indexeddb.js
index edad7ae0..4b738739 100644
--- a/dist/indexeddb.js
+++ b/dist/indexeddb.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/IndexedDB/index.js');
-delete global.__jaydataModuleRoot;
\ No newline at end of file
+module.exports = require('./lib/Types/StorageProviders/IndexedDB/index.js');
\ No newline at end of file
diff --git a/dist/inmemory.js b/dist/inmemory.js
index dd75b41c..79b9ee45 100644
--- a/dist/inmemory.js
+++ b/dist/inmemory.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/InMemory/index.js');
-delete global.__jaydataModuleRoot;
\ No newline at end of file
+module.exports = require('./lib/Types/StorageProviders/InMemory/index.js');
\ No newline at end of file
diff --git a/dist/mongodb.js b/dist/mongodb.js
index 3efff3f7..128d51bb 100644
--- a/dist/mongodb.js
+++ b/dist/mongodb.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/mongoDB/index.js');
-delete global.__jaydataModuleRoot;
\ No newline at end of file
+module.exports = require('./lib/Types/StorageProviders/mongoDB/index.js');
\ No newline at end of file
diff --git a/dist/odata.js b/dist/odata.js
index 99da915f..31b78771 100644
--- a/dist/odata.js
+++ b/dist/odata.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/oData/index.js');
-delete global.__jaydataModuleRoot;
+module.exports = require('./lib/Types/StorageProviders/oData/index.js');
\ No newline at end of file
diff --git a/dist/package.json b/dist/package.json
index de410753..6c151016 100644
--- a/dist/package.json
+++ b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jaydata",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "description": "Cross-platform HTML5 data-management, JavaScript Language Query (JSLQ) support for OData, SQLite, WebSQL, IndexedDB, YQL and Facebook (packaged for Node.JS)",
   "keywords": [
     "HTML5 data management",
@@ -36,7 +36,7 @@
       "jaydata-odatajs": "^4.0.1",
       "jaydata-error-handler": "^0.0.1",
       "jaydata-promise-handler": "^0.0.1",
-      "jaydata-dynamic-metadata": "^0.1.16",
+      "jaydata-dynamic-metadata": "^0.1.17",
       "odata-v4-metadata": "^0.1.3",
       "xmldom": "^0.1.19"
   },
diff --git a/dist/sqlite.js b/dist/sqlite.js
index 33f962a9..e01cc313 100644
--- a/dist/sqlite.js
+++ b/dist/sqlite.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/SqLite/index.js');
-delete global.__jaydataModuleRoot;
\ No newline at end of file
+module.exports = require('./lib/Types/StorageProviders/SqLite/index.js');
\ No newline at end of file
diff --git a/dist/webapi.js b/dist/webapi.js
index e8dea3f7..15a55b53 100644
--- a/dist/webapi.js
+++ b/dist/webapi.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/WebApi/index.js');
-delete global.__jaydataModuleRoot;
\ No newline at end of file
+module.exports = require('./lib/Types/StorageProviders/WebApi/index.js');
\ No newline at end of file
diff --git a/dist/yql.js b/dist/yql.js
index 0ec30f13..bb7df093 100644
--- a/dist/yql.js
+++ b/dist/yql.js
@@ -1,3 +1 @@
-global.__jaydataModuleRoot = __dirname;
-module.exports = require('./lib/Types/StorageProviders/YQL/index.js');
-delete global.__jaydataModuleRoot;
\ No newline at end of file
+module.exports = require('./lib/Types/StorageProviders/YQL/index.js');
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 437732ab..02580153 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,6 +7,7 @@ var uglify = require('gulp-uglify');
 var minimist = require('minimist');
 var rename = require('gulp-rename');
 var replace = require('gulp-replace');
+var change = require('gulp-change');
 var header = require('gulp-header');
 var sourcemaps = require('gulp-sourcemaps');
 var babel = require('gulp-babel');
@@ -65,12 +66,22 @@ gulp.task('readme', function(){
     .pipe(gulp.dest('./dist'));
 });
 
+var sep = require('path').sep;
+function replaceJayDataCorePath(content){
+    if (content.indexOf("'jaydata/core'") >= 0){
+        var deep = this.fname.split(sep);
+        var path = "'" + deep.map(function(){ return "../"; }).join("") + "core.js'";
+        return content.replace("'jaydata/core'", path);
+    }else return content;
+}
+
 gulp.task('nodejs', ['readme'], function() {
     return gulp.src(['src/**/*.js'])
     .pipe(babel({
         compact: false
     }))
-    .pipe(replace("'jaydata/core'", "require('path').join(global.__jaydataModuleRoot, 'core.js')"))
+    //.pipe(replace("'jaydata/core'", "require('path').join(global.__jaydataModuleRoot, 'core.js')"))
+    .pipe(change(replaceJayDataCorePath))
     .pipe(gulp.dest('./dist/lib'))
     .on('error', function(err){
 		console.log('>>> ERROR', err);
diff --git a/package.json b/package.json
index 570ef75f..a6175296 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jaydata",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "description": "Cross-platform HTML5 data-management, JavaScript Language Query (JSLQ) support for OData, SQLite, WebSQL, IndexedDB, YQL and Facebook (packaged for Node.JS)",
   "keywords": [
     "HTML5 data management",
@@ -27,7 +27,7 @@
     "atob": "^2.0.0",
     "btoa": "^1.1.2",
     "dot": "^1.0.3",
-    "jaydata-dynamic-metadata": "^0.1.16",
+    "jaydata-dynamic-metadata": "^0.1.17",
     "jaydata-error-handler": "^0.0.1",
     "jaydata-odatajs": "^4.0.1",
     "jaydata-promise-handler": "^0.0.1",
@@ -93,6 +93,7 @@
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.1",
     "gulp-browserify": "^0.5.1",
+    "gulp-change": "^1.0.0",
     "gulp-closure-compiler": "^0.3.1",
     "gulp-concat": "^2.6.0",
     "gulp-derequire": "^2.1.0",
diff --git a/src/Types/StorageProviderLoader.js b/src/Types/StorageProviderLoader.js
index f075a8dc..d1b7f67c 100644
--- a/src/Types/StorageProviderLoader.js
+++ b/src/Types/StorageProviderLoader.js
@@ -230,7 +230,7 @@ $data.Class.define('$data.StorageProviderLoaderBase', null, null, {
     loadNpmModule: function (currentProvider, providerList, callback) {
         var provider = null;
         try {
-            require(this.npmModules[currentProvider]);
+            global["require"](this.npmModules[currentProvider]);
             provider = $data.RegisteredStorageProviders[currentProvider];
             $data.Trace.log('NPM module loader successfully registered ' + currentProvider + ' provider');
         } catch (e) {