diff --git a/server/core/config.c b/server/core/config.c
index db9d38fed..1adae44a5 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -2252,3 +2252,8 @@ void
 config_disable_feedback_task(void) {
         hktask_remove("send_feedback");
 }
+
+unsigned long  config_get_gateway_id()
+{
+    return gateway.id;
+}
\ No newline at end of file
diff --git a/server/include/config.h b/server/include/config.h
index 3648c97a0..ce27a3598 100644
--- a/server/include/config.h
+++ b/server/include/config.h
@@ -140,4 +140,5 @@ bool config_get_valtarget(
 
 void config_enable_feedback_task(void);
 void config_disable_feedback_task(void);
+unsigned long  config_get_gateway_id(void);
 #endif
diff --git a/server/include/monitor.h b/server/include/monitor.h
index 27d3f8144..2cf05daca 100644
--- a/server/include/monitor.h
+++ b/server/include/monitor.h
@@ -73,9 +73,12 @@ typedef struct {
 	void	(*unregisterServer)(void *, SERVER *);
 	void	(*defaultUser)(void *, char *, char *);
 	void	(*diagnostics)(DCB *, void *);
+
 	void	(*setInterval)(void *, size_t);
 	void	(*setNetworkTimeout)(void *, int, int);
+
 	void	(*defaultId)(void *, unsigned long);
+
 	void	(*replicationHeartbeat)(void *, int);
 	void	(*detectStaleMaster)(void *, int);
 	void	(*disableMasterFailback)(void *, int);
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index e1fec9272..80e51b300 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -64,6 +64,8 @@
 #include <dcb.h>
 #include <modinfo.h>
 
+#include "config.h"
+
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;
 extern size_t         log_ses_count[];
@@ -164,7 +166,7 @@ GetModuleObject()
  * @return A handle to use when interacting with the monitor
  */
 static	void 	*
-startMonitor(void *arg)
+startMonitor(void *arg,CONFIG_PARAMETER param)
 {
 MYSQL_MONITOR *handle;