--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Mon Dec 16 12:10:45 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Mon Dec 16 15:15:32 2013 +0100
@@ -96,6 +96,24 @@
 						}
 					}
 					break;
+				case Tokens.FORMATTER:
+					options.setFormatterName(fetchNext(args, ++i));
+					break;
+				case Tokens.INFO_HELP:
+					options.addShowInfo(CLIOptions.INFO_TYPE.HELP);
+					break;
+				case Tokens.INFO_FORMATTERS:
+					options.addShowInfo(CLIOptions.INFO_TYPE.FORMATTERS);
+					break;
+				case Tokens.INFO_LICENSE:
+					options.addShowInfo(CLIOptions.INFO_TYPE.LICENSE);
+					break;
+				case Tokens.INFO_TYPES:
+					options.addShowInfo(CLIOptions.INFO_TYPE.TYPES);
+					break;
+				case Tokens.INFO_VERSION:
+					options.addShowInfo(CLIOptions.INFO_TYPE.VERSION);
+					break;
 				default:
 					throw new CLIParserException("Unknown option: " + arg);
 			}
@@ -121,6 +139,12 @@
 		public static final String DATA = "--data";
 		public static final String NAME_PREFIX = "--name-prefix";
 		public static final String TYPES = "--types";
+		public static final String FORMATTER = "--formatter";
+		public static final String INFO_HELP = "--help";
+		public static final String INFO_VERSION = "--version";
+		public static final String INFO_LICENSE = "--license";
+		public static final String INFO_FORMATTERS = "--list-formatters";
+		public static final String INFO_TYPES = "--list-types";
 
 		private Tokens() {
 		}