diff --git a/config.coffee b/config.coffee
index d2b36c9..5c9e453 100644
--- a/config.coffee
+++ b/config.coffee
@@ -19,6 +19,16 @@ exports.LOG_INFORMS = false
 exports.DEBUG_DEVICES = {} # {'202BC1-BM632w-8KA8WA1151100043' : true}
 exports.DEVICE_ONLINE_THRESHOLD = 4000
 
+exports.MONGODB_OPTIONS = {
+  db : {
+    w : 1
+    wtimeout : 60000
+  }
+  server : {
+    auto_reconnect : true
+  }
+}
+
 # load configuration
 c = require('./config/config')
 for k, v of c
diff --git a/db.coffee b/db.coffee
index dd7c4eb..be9d80d 100644
--- a/db.coffee
+++ b/db.coffee
@@ -8,17 +8,7 @@ devicesCollection = null
 presetsCollection = null
 objectsCollection = null
 
-options = {
-  db : {
-    w : 1
-    wtimeout : 60000
-  }
-  server : {
-    auto_reconnect : true
-  }
-}
-
-mongodb.MongoClient.connect("mongodb://#{config.MONGODB_SOCKET}/#{config.DATABASE_NAME}", options, (err, db) ->
+mongodb.MongoClient.connect("mongodb://#{config.MONGODB_SOCKET}/#{config.DATABASE_NAME}", config.MONGODB_OPTIONS, (err, db) ->
   exports.mongoDb = db
   db.collection('tasks', (err, collection) ->
     throw new Error(err) if err?
diff --git a/files.coffee b/files.coffee
index bcdb588..1274948 100644
--- a/files.coffee
+++ b/files.coffee
@@ -4,8 +4,11 @@ http = require 'http'
 url = require 'url'
 mongodb = require 'mongodb'
 
-dbserver = new mongodb.Server(config.MONGODB_SOCKET, 0, {auto_reconnect: true})
-db = new mongodb.Db(config.DATABASE_NAME, dbserver, {native_parser:true, safe:true})
+db = null
+mongodb.MongoClient.connect("mongodb://#{config.MONGODB_SOCKET}/#{config.DATABASE_NAME}", config.MONGODB_OPTIONS, (err, _db) ->
+  db = _db
+)
+
 
 cluster = require 'cluster'
 numCPUs = require('os').cpus().length