--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Sun Dec 22 22:02:44 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Sun Dec 22 23:31:55 2013 +0100
@@ -21,6 +21,7 @@
 import static info.globalcode.sql.dk.Functions.isEmpty;
 import static info.globalcode.sql.dk.Functions.equalz;
 import info.globalcode.sql.dk.SQLCommand.COMMAND_TYPE;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -59,7 +60,7 @@
 		CONNECTION
 	}
 	private COMMAND_TYPE commandType;
-	private final Collection<NamedParameter> namedParameters = new ArrayList<>();
+	private final List<NamedParameter> namedParameters = new ArrayList<>();
 	private final List<Parameter> numberedParameters = new ArrayList<>();
 	private final EnumSet<INFO_TYPE> showInfo = EnumSet.noneOf(INFO_TYPE.class);
 
@@ -207,4 +208,16 @@
 	public void setDatabaseNameToTest(String databaseNameToTest) {
 		this.databaseNameToTest = databaseNameToTest;
 	}
+
+	public SQLCommand getSQLCommand() {
+		if (namedParameters.isEmpty()) {
+			return new SQLCommandNumbered(commandType, sql, numberedParameters);
+		} else {
+			return new SQLCommandNamed(commandType, sql, namedParameters);
+		}
+	}
+
+	public OutputStream getOutputStream() {
+		return System.out;
+	}
 }