diff --git a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
index ac77163eab4a9bdcf2194c49cb6b156dc27d42e4..3079c44dc484b872e1ec6fa3bc72459c9d86486f 100644
--- a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: edu.kit.ipd.descartes.core;bundle-version="1.0.0",
  org.eclipse.ocl
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.core.resources,
+Import-Package: edu.kit.ipd.descartes.ql.models.repository,
+ org.eclipse.core.resources,
  org.eclipse.emf.ecore.xmi.impl,
  org.eclipse.ocl.ecore
diff --git a/edu.kit.ipd.descartes.adaptation/default.properties b/edu.kit.ipd.descartes.adaptation/default.properties
index b1be257d36b4878dba9c9083c174acac174cbc2f..aad956dce207b971a0d8a5f8da9f85fa9ccb1bab 100644
--- a/edu.kit.ipd.descartes.adaptation/default.properties
+++ b/edu.kit.ipd.descartes.adaptation/default.properties
@@ -1,27 +1,31 @@
 #processName=AdaptationEngine
 #adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
-#performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
+#perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
+#perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
 #maxIterations=2
 ## The list of triggering events can be found in AdaptationControl.java
 #eventType=
 
 processName=SEAMS_PushPull-v1
 adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/pushpull.adaptation
-performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo
+perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
+perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo
 maxIterations=2
 # The list of triggering events can be found in AdaptationControl.java
 eventType=SlaViolatedEvent
 
 #processName=BlueYonderTestAdaptationProcess
 #adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/runtime-EclipseApplication/by_dmm-model/testprocess.adaptation
-#performanceDataRepositoryModel=../Examples/SEAMS_Case_Study/simucom-simulationResults.perfdatarepo
+#perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
+#perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucom-simulationResults.perfdatarepo
 #maxIterations=1
 ### The list of triggering events can be found in AdaptationControl.java
 #eventType=BottleneckFoundEvent
 
 #processName=SEAMS_PushPull-v2
 #adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation
-#performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo
+#perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
+#perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo
 #maxIterations=2
 ## The list of triggering events can be found in AdaptationControl.java
 #eventType=SlaViolatedEvent
\ No newline at end of file