diff --git a/adaptor-xmpp.js b/adaptor-xmpp.js
index c4a7aa2..693c6fe 100644
--- a/adaptor-xmpp.js
+++ b/adaptor-xmpp.js
@@ -80,6 +80,10 @@ function init(_username, _password, _logger, _callbacks) {
 }
 
 function setOptions(options) {
+    if (options.config) {
+        config = options.config;
+    }
+    
     if (!options.matrix) {
         return;
     }
diff --git a/matrix-util.js b/matrix-util.js
index b36d563..0a5b661 100644
--- a/matrix-util.js
+++ b/matrix-util.js
@@ -1,8 +1,11 @@
 'use strict';
 
 var moment = require('moment');
+
+var config;
+
 var momentFormat = 'YYYY-MM-DD HH:mm:ss';
-var maxHealthyWaitMs = 2 * 60 * 1000;
+var defaultMaxHealthyWaitMs = 2 * 60 * 1000;
 
 module.exports = MatrixUtil;
 
@@ -19,6 +22,11 @@ function _cleanPartnerId(partnerId) {
     return cleaned;
 }
 
+function getMaxHealthyWaitMs() {
+    if (!config || !config.globals || !config.globals.max_healthy_wait_ms) { return defaultMaxHealthyWaitMs; }
+    return config.globals.max_healthy_wait_ms;
+}
+
 function MatrixUtil(options) {
     if (!options) {
         console.trace('Undefined options');
@@ -36,6 +44,12 @@ function MatrixUtil(options) {
         console.trace("Logger not set");
         process.exit(1);
     }
+
+    this.config = options.config;
+    if (!this.config) new Promise(function(resolve, reject) {
+        console.trace("Config not set");
+        process.exit(1);
+    });
 }
 
 MatrixUtil.prototype.updateBuddyState = function(jid, state, statusText, resource) {
@@ -229,7 +243,6 @@ MatrixUtil.prototype._updateLastMessage = function(partner, msg, direction) {
     }
 }
 
-
 MatrixUtil.prototype.updateLastIncoming = function(partner, msg) {
     this._updateLastMessage(partner, msg, 'incoming');
 }