diff --git a/VERSION b/VERSION
index faef31a43..3eefcb9dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.0
+1.0.0
diff --git a/query_classifier/test/testmain.c b/query_classifier/test/testmain.c
index cfb0f6ef4..00000de98 100644
--- a/query_classifier/test/testmain.c
+++ b/query_classifier/test/testmain.c
@@ -404,7 +404,8 @@ int main(int argc, char** argv)
         while(succp) {
                 qtest = slcursor_get_case(c);
                 qtest->qt_result_type =
-                        skygw_query_classifier_get_type(qtest->qt_query_str, f);
+                        skygw_query_classifier_get_type(qtest->qt_query_str, f,
+						&mysql);
                 succp = slcursor_step_ahead(c);
         }
         /**
diff --git a/server/core/Makefile b/server/core/Makefile
index 6f08a4729..9bf650c34 100644
--- a/server/core/Makefile
+++ b/server/core/Makefile
@@ -72,10 +72,10 @@ OBJ=$(SRCS:.c=.o)
 KOBJS=maxkeys.o secrets.o utils.o
 POBJS=maxpasswd.o secrets.o utils.o
 
-LIBS=-L../inih/extra -linih -lssl -lstdc++ \
-	-L$(EMBEDDED_LIB) \
+LIBS=-L$(EMBEDDED_LIB) \
+	-lmysqld \
 	-lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \
-	-lmysqld
+	-L../inih/extra -linih -lssl -lstdc++ 
 
 all:	maxscale maxkeys maxpasswd
 
diff --git a/server/modules/filter/qlafilter.c b/server/modules/filter/qlafilter.c
index 818c1a6f1..da78713d2 100644
--- a/server/modules/filter/qlafilter.c
+++ b/server/modules/filter/qlafilter.c
@@ -50,7 +50,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A simple query logging filter"
 };
diff --git a/server/modules/filter/regexfilter.c b/server/modules/filter/regexfilter.c
index aae2dfa3a..5c4f1e7df 100644
--- a/server/modules/filter/regexfilter.c
+++ b/server/modules/filter/regexfilter.c
@@ -43,7 +43,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A query rewrite filter that uses regular expressions to rewite queries"
 };
diff --git a/server/modules/filter/tee.c b/server/modules/filter/tee.c
index 06dc39251..34efbb65b 100644
--- a/server/modules/filter/tee.c
+++ b/server/modules/filter/tee.c
@@ -60,7 +60,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A tee piece in the filter plumbing"
 };
diff --git a/server/modules/filter/testfilter.c b/server/modules/filter/testfilter.c
index ba05e535e..f72471a36 100644
--- a/server/modules/filter/testfilter.c
+++ b/server/modules/filter/testfilter.c
@@ -32,7 +32,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A simple query counting filter"
 };
diff --git a/server/modules/filter/topfilter.c b/server/modules/filter/topfilter.c
index 62781fe22..d4d594e6d 100644
--- a/server/modules/filter/topfilter.c
+++ b/server/modules/filter/topfilter.c
@@ -47,7 +47,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	FILTER_VERSION,
 	"A top N query logging filter"
 };
diff --git a/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index c9c3aef01..3cba61325 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -56,7 +56,7 @@ static char *version_str = "V1.2.0";
 
 MODULE_INFO	info = {
 	MODULE_API_MONITOR,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	MONITOR_VERSION,
 	"A Galera cluster monitor"
 };
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 21ff14b6f..ee5b4eeb7 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -66,7 +66,7 @@ static char *version_str = "V1.2.0";
 
 MODULE_INFO	info = {
 	MODULE_API_MONITOR,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	MONITOR_VERSION,
 	"A MySQL Master/Slave replication monitor"
 };
diff --git a/server/modules/protocol/maxscaled.c b/server/modules/protocol/maxscaled.c
index 0c7b4b744..738c78111 100644
--- a/server/modules/protocol/maxscaled.c
+++ b/server/modules/protocol/maxscaled.c
@@ -40,7 +40,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"A maxscale protocol for the administration interface"
 };
diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c
index b277bb505..acb1f8488 100644
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@@ -47,7 +47,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"The MySQL to backend server protocol"
 };
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 5d577eebd..1db23b4fe 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -44,7 +44,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"The client to MaxScale MySQL protocol implementation"
 };
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index b5ae23c1a..aeb6607c4 100644
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@@ -40,7 +40,7 @@
 
 MODULE_INFO info = {
 	MODULE_API_PROTOCOL,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	GWPROTOCOL_VERSION,
 	"A telnet deamon protocol for simple administration interface"
 };
diff --git a/server/modules/routing/cli.c b/server/modules/routing/cli.c
index 9abfa5377..ac525f695 100644
--- a/server/modules/routing/cli.c
+++ b/server/modules/routing/cli.c
@@ -48,7 +48,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"The admin user interface"
 };
diff --git a/server/modules/routing/debugcli.c b/server/modules/routing/debugcli.c
index e58a25163..aa0e82ef8 100644
--- a/server/modules/routing/debugcli.c
+++ b/server/modules/routing/debugcli.c
@@ -47,7 +47,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"The debug user interface"
 };
diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index ee12f7c99..0fc5fd4ce 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -93,7 +93,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"A connection based router to load balance based on connections"
 };
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index c39fef739..90132a9f9 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -35,7 +35,7 @@
 
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
-	MODULE_ALPHA_RELEASE,
+	MODULE_BETA_RELEASE,
 	ROUTER_VERSION,
 	"A Read/Write splitting router for enhancement read scalability"
 };