--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Mon Dec 30 23:46:41 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Tue Dec 31 17:35:33 2013 +0100
@@ -20,6 +20,8 @@
 import static info.globalcode.sql.dk.Functions.isNotEmpty;
 import static info.globalcode.sql.dk.Functions.equalz;
 import info.globalcode.sql.dk.InfoLister.InfoType;
+import info.globalcode.sql.dk.configuration.Properties;
+import info.globalcode.sql.dk.configuration.Property;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,6 +47,8 @@
 	private String nameSuffix = DEFAULT_NAME_SUFFIX;
 	private String formatterName;
 	private boolean batch;
+	private Properties formatterProperties = new Properties();
+	private Properties databaseProperties = new Properties();
 
 	public enum MODE {
 
@@ -167,6 +171,22 @@
 		namedParameters.add(p);
 	}
 
+	public Properties getDatabaseProperties() {
+		return databaseProperties;
+	}
+
+	public Properties getFormatterProperties() {
+		return formatterProperties;
+	}
+
+	public void addDatabaseProperty(Property p) {
+		databaseProperties.add(p);
+	}
+
+	public void addFormatterProperty(Property p) {
+		formatterProperties.add(p);
+	}
+
 	/**
 	 * @return regular expression describing the name prefix
 	 */