--- a/tool/main.cpp	Thu Sep 06 14:21:02 2012 +0200
+++ b/tool/main.cpp	Mon Nov 03 15:20:05 2014 +0100
@@ -83,8 +83,10 @@
 string dataTypeStr;
 Command::Verbosity verbosity = Command::Normal;
 bool force = false;
+bool emergency = false;
 bool helpRequested = false;
 string outputFile;
+string skin;
 
 /*****************************************************************************/
 
@@ -147,6 +149,8 @@
         {"domain",      required_argument, NULL, 'd'},
         {"type",        required_argument, NULL, 't'},
         {"output-file", required_argument, NULL, 'o'},
+        {"skin",        required_argument, NULL, 's'},
+        {"emergency",   no_argument,       NULL, 'e'},
         {"force",       no_argument,       NULL, 'f'},
         {"quiet",       no_argument,       NULL, 'q'},
         {"verbose",     no_argument,       NULL, 'v'},
@@ -155,7 +159,7 @@
     };
 
     do {
-        c = getopt_long(argc, argv, "m:a:p:d:t:o:fqvh", longOptions, NULL);
+        c = getopt_long(argc, argv, "m:a:p:d:t:o:s:efqvh", longOptions, NULL);
 
         switch (c) {
             case 'm':
@@ -182,6 +186,14 @@
                 outputFile = optarg;
                 break;
 
+            case 's':
+                skin = optarg;
+                break;
+
+            case 'e':
+                emergency = true;
+                break;
+
             case 'f':
                 force = true;
                 break;
@@ -308,6 +320,8 @@
                     cmd->setDomains(domains);
                     cmd->setDataType(dataTypeStr);
                     cmd->setOutputFile(outputFile);
+                    cmd->setSkin(skin);
+                    cmd->setEmergency(emergency);
                     cmd->setForce(force);
                     cmd->execute(commandArgs);
                 } catch (InvalidUsageException &e) {