--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java	Wed Sep 24 22:53:30 2014 +0200
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java	Thu Sep 25 17:50:40 2014 +0200
@@ -31,6 +31,8 @@
 import info.globalcode.sql.dk.formatting.Formatter;
 import info.globalcode.sql.dk.formatting.FormatterContext;
 import info.globalcode.sql.dk.formatting.FormatterException;
+import info.globalcode.sql.dk.jmx.ConnectionManagement;
+import info.globalcode.sql.dk.jmx.ManagementUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -149,7 +151,9 @@
 	private void processQueryNow() throws ConfigurationException, SQLException, FormatterException {
 		DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName());
 		FormatterDefinition fd = configuration.getFormatter(options.getFormatterName());
-		try (DatabaseConnection c = dd.connect(options.getDatabaseProperties())) {
+		ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName());
+
+		try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) {
 			log.log(Level.FINE, "Database connected");
 			try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) {
 				c.executeQuery(options.getSQLCommand(), f);
@@ -169,7 +173,9 @@
 
 		DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName());
 		FormatterDefinition fd = configuration.getFormatter(options.getFormatterName());
-		try (DatabaseConnection c = dd.connect(options.getDatabaseProperties())) {
+		ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName());
+
+		try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) {
 			log.log(Level.FINE, "Database connected");
 			try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) {
 				c.executeBatch(b, f);