diff --git a/Makefile b/Makefile
index be38283..2dd58a2 100644
--- a/Makefile
+++ b/Makefile
@@ -115,14 +115,17 @@ install:
 
 # ---- Builder uses this target to run the application ----------------------- #
 run: all
-	bin/gem-graph-server
+	@bin/gem-graph-server -C debian/etc -M debian/var/models \
+		-U debian/var/users
 run-both: all
-	bin/gem-graph-server & sleep 1 && bin/gem-graph-ctl
+	@bin/gem-graph-server -C debian/etc -M debian/var/models \
+		-U debian/var/users & sleep 1 && bin/gem-graph-ctl
 run-server: all
-	bin/gem-graph-server
+	@bin/gem-graph-server -C debian/etc -M debian/var/models \
+		-U debian/var/users
 run-cli: all
-	bin/gem-graph-ctl
+	@bin/gem-graph-ctl
 run-tests: tests
-	bin/tests/scheduler
+	@bin/tests/scheduler
 
 include $(DEPS)
diff --git a/debian/control b/debian/control
index d7fcae4..eef2923 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,6 @@ Priority: optional
 Depends: libxml2
 Architecture: amd64
 Essential: no
-Installed-Size: 1049
+Installed-Size: 112760
 Maintainer: The Gem-graph Project
-Description: The gem-graph computation server
+Description: The wonderful gem-graph computation server
diff --git a/include/xml.h b/include/xml.h
index 337b5e8..c9db7f9 100644
--- a/include/xml.h
+++ b/include/xml.h
@@ -117,7 +117,7 @@ static inline xmlNodePtr findRoot(const char *tagName, xmlNodePtr curRoot)
         }
 
         if (cur->xmlChildrenNode) {
-            if ((recur = findRoot(tagName, cur->xmlChildrenNode) != NULL))
+            if ((recur = findRoot(tagName, cur->xmlChildrenNode)) != NULL)
                 return recur;
         }
 
diff --git a/src/main.c b/src/main.c
index be21337..32a3817 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,7 +25,7 @@
 
 static Server_t *server;
 
-static void ExitingHandler(int signum)
+static void SigIntTermHandler(int signum)
 {
     server->pleaseStop = true;
     printLog("Server stopping\n");
@@ -39,27 +39,84 @@ static void ExitingHandler(int signum)
 //      - models & users directories
 int main(int argc, char **argv)
 {
+    int options;
     time_t t;
     int returnValue = 0;
+    Parameters_t *parameters;
 
     // Get parameters TODO from args
-    Parameters_t *parameters = (Parameters_t*) calloc(sizeof(Parameters_t), 1);
+    parameters = (Parameters_t*) calloc(sizeof(Parameters_t), 1);
 
-    parameters->configDir = (char*) malloc(255 * sizeof(char));
-    realpath("./debian/etc", parameters->configDir);
+    while ((options = getopt(argc, argv, ":C:M:U:")) != -1) {
+        switch (options) {
+        case 'C':
+            printLog("Config : %s\n", optarg);
+            parameters->configDir = (char*) malloc(strlen(optarg) + 1);
+            strcpy(parameters->configDir, optarg);
+            break;
+        case 'M':
+            printLog("Models : %s\n", optarg);
+            parameters->modelDir = (char*) malloc(strlen(optarg) + 1);
+            strcpy(parameters->modelDir, optarg);
+            break;
+        case 'U':
+            printLog("User : %s\n", optarg);
+            parameters->userDir = (char*) malloc(strlen(optarg) + 1);
+            strcpy(parameters->userDir, optarg);
+            break;
+        case ':':
+            printLog("Option missing argument : %c\n", optopt);
+            if (parameters->configDir)
+                free(parameters->configDir);
 
-    parameters->modelDir = (char*) malloc(255 * sizeof(char));
-    realpath("./debian/var/models", parameters->modelDir);
+            if (parameters->modelDir)
+                free(parameters->modelDir);
 
-    parameters->userDir = (char*) malloc(255 * sizeof(char));
-    realpath("./debian/var/users", parameters->userDir);
+            if (parameters->userDir)
+                free(parameters->userDir);
+
+            free(parameters);
+            return ENOSYS;
+            break;
+        case '?':
+            printLog("Unknown option : %c\n", optopt);
+            if (parameters->configDir)
+                free(parameters->configDir);
+
+            if (parameters->modelDir)
+                free(parameters->modelDir);
+
+            if (parameters->userDir)
+                free(parameters->userDir);
+
+            free(parameters);
+            return ENOSYS;
+            break;
+        }
+    }
+
+    if (!parameters->configDir | !parameters->modelDir | !parameters->userDir) {
+        printLog("Missing arguments\n");
+
+        if (parameters->configDir)
+            free(parameters->configDir);
+
+        if (parameters->modelDir)
+            free(parameters->modelDir);
+
+        if (parameters->userDir)
+            free(parameters->userDir);
+
+        free(parameters);
+        return ENOSYS;
+    }
 
     // Go!
     printLog("Starting gem-graph-server...\n");
 
     // Register new interrupt handler
-    signal(SIGINT, ExitingHandler);
-    signal(SIGTERM, ExitingHandler);
+    signal(SIGINT, SigIntTermHandler);
+    signal(SIGTERM, SigIntTermHandler);
 
     // Initializing random generator
     t = time(&t);
diff --git a/src/model.c b/src/model.c
index 99f15d9..4464a5b 100644
--- a/src/model.c
+++ b/src/model.c
@@ -48,48 +48,10 @@ Model_t *lastModel;
 Model_t **lastModelAddr;
 
 
-static int ModelParseFile(Model_t *model);
-
-
+static inline int ModelParseFile(Model_t *model);
 void ModelSystemDestroy(void);
 
 /* -------------------------------------------------------------------------- */
-void ModelCreate(Model_t **newModel) // TODO manage deletion and empty slots
-{
-    // increment index
-    knownModelSize++;
-    // create socket
-    knownModel =
-        (Model_t**) realloc(knownModel, knownModelSize * sizeof(Model_t*));
-    // populate socket
-    knownModel[knownModelSize-1] = (Model_t*) calloc(1, sizeof(Model_t));
-    // populate model
-    knownModel[knownModelSize-1]->id = knownModelSize;
-    // return value
-    *newModel = knownModel[knownModelSize-1];
-    lastModel = knownModel[knownModelSize-1];
-    lastModelAddr = &knownModel[knownModelSize-1];
-
-    // cont. model population
-    knownModel[knownModelSize-1]->name =
-        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
-
-    knownModel[knownModelSize-1]->filename =
-        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
-
-    knownModel[knownModelSize-1]->author =
-        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
-
-    knownModel[knownModelSize-1]->version =
-        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
-
-    knownModel[knownModelSize-1]->space_xMax = XMAX;
-    knownModel[knownModelSize-1]->space_yMax = YMAX;
-    knownModel[knownModelSize-1]->space_zMax = ZMAX;
-    knownModel[knownModelSize-1]->nmaxThread = MAX_THREAD;
-    knownModel[knownModelSize-1]->nmaxCycles = MAX_CYCLES;
-    knownModel[knownModelSize-1]->siteNumber = 0;
-}
 
 void printModels(char *buf)
 {
@@ -126,6 +88,8 @@ int ModelLoad(int id) // TODO unload !
     return loadedModelSize;
 }
 
+/* -------------------------------------------------------------------------- */
+
 int ModelRun(int id)
 {
     if (id <= 0 || id > loadedModelSize)
@@ -179,6 +143,45 @@ int ModelStop(int id)
     return 1;
 }
 
+/* -------------------------------------------------------------------------- */
+
+void ModelCreate(Model_t **newModel) // TODO manage deletion and empty slots
+{
+    // increment index
+    knownModelSize++;
+    // create socket
+    knownModel =
+        (Model_t**) realloc(knownModel, knownModelSize * sizeof(Model_t*));
+    // populate socket
+    knownModel[knownModelSize-1] = (Model_t*) calloc(1, sizeof(Model_t));
+    // populate model
+    knownModel[knownModelSize-1]->id = knownModelSize;
+    // return value
+    *newModel = knownModel[knownModelSize-1];
+    lastModel = knownModel[knownModelSize-1];
+    lastModelAddr = &knownModel[knownModelSize-1];
+
+    // cont. model population
+    knownModel[knownModelSize-1]->name =
+        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
+
+    knownModel[knownModelSize-1]->filename =
+        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
+
+    knownModel[knownModelSize-1]->author =
+        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
+
+    knownModel[knownModelSize-1]->version =
+        (char *) calloc(1, sizeof(char) * MAX_MODEL_NAME_SIZE);
+
+    knownModel[knownModelSize-1]->space_xMax = XMAX;
+    knownModel[knownModelSize-1]->space_yMax = YMAX;
+    knownModel[knownModelSize-1]->space_zMax = ZMAX;
+    knownModel[knownModelSize-1]->nmaxThread = MAX_THREAD;
+    knownModel[knownModelSize-1]->nmaxCycles = MAX_CYCLES;
+    knownModel[knownModelSize-1]->siteNumber = 0;
+}
+
 void ModelDelete(int id) //XXX
 {
     free(knownModel[id-1]->name);
@@ -206,6 +209,8 @@ void ModelShutdown(void)
     }
 }
 
+/* -------------------------------------------------------------------------- */
+
 void ModelSystemInit(Parameters_t *parameters)
 {
     struct dirent *modelDirEntry = NULL;
@@ -282,7 +287,7 @@ void ModelSystemDestroy(void)
 
 /* -------------------------------------------------------------------------- */
 
-static int ModelParseFile(Model_t *model)
+static inline int ModelParseFile(Model_t *model)
 {
     ModelField_t identityField;
     ModelField_t authorField;