diff --git a/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch b/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch
index 33996e29e029bb026617acb701084e97f3a3ecf0..d16e1300cca8d65978d5ace96567a725f075f067 100644
--- a/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch
+++ b/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch
@@ -10,5 +10,6 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="edu.kit.ipd.descartes.adaptation.AdaptationControl"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="default.properties"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="edu.kit.ipd.descartes.adaptation"/>
 </launchConfiguration>
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
index 7e9792bdfceb743489b7286aabd1c8d8eedb0bda..27667da17cbef079786a9ac573370de22fb18658 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
@@ -85,10 +85,12 @@ public class AdaptationControl {
     public static void main(String[] args) throws IOException {
         BasicConfigurator.configure();
         Logger.getRootLogger().setLevel(Level.DEBUG);
+        
+        String propertiesfile = args[0];
 
         AdaptationControl adaptationController = new AdaptationControl();
         // Initialize controller (load models, create Action handler, etc.)
-        adaptationController.init();
+        adaptationController.init(propertiesfile);
         Event triggeringEvent = adaptationController.createTriggeringEvent();
 
         // trigger adaptation process
@@ -133,10 +135,13 @@ public class AdaptationControl {
 
     }
 
-    public void init() {
+    public void init(String propertiesFile) {
         try {
             // load properties file
-            loadProperties(DEFAULT_PROP_FILE_PATH);
+            if (propertiesFile == null || propertiesFile.equals(""))
+                loadProperties(DEFAULT_PROP_FILE_PATH);
+            else
+                loadProperties(propertiesFile);
 
             // load required models
             adaptationProcess = adaptationProcessModelLoader.load(URI.createFileURI(adaptationProcessXmiFilePath));