diff --git a/tools.descartes.dql.connector.kieker.examples/pet-clinic/ListMetrics.dql b/tools.descartes.dql.connector.kieker.examples/pet-clinic/ListMetrics.dql
index ff6c66554505789c690e647e6889984d4e735729..cf841f49db3aadd279079b168744e4e940775326 100644
--- a/tools.descartes.dql.connector.kieker.examples/pet-clinic/ListMetrics.dql
+++ b/tools.descartes.dql.connector.kieker.examples/pet-clinic/ListMetrics.dql
@@ -1,9 +1,6 @@
-LIST METRICS (SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP' AS OwnerControllerHTTP,
-	SERVICE 'org.springframework.samples.petclinic.web.WelcomeControllerHTTP.welcomeGET()' AS welcomeGET_works,
-	SERVICE 'org.springframework.samples.petclinic.web.VetControllerHTTP.showVetListGET()' AS showVetList_X,
-	SERVICE 'org.springframework.samples.petclinic.web.VetController.showVetList()' AS showVetList,
-	SERVICE 'org.springframework.samples.petclinic.web.VetController.showVetList(java.Util.map)' AS showVetList2,
-	SERVICE 'org.springframework.samples.petclinic.web.OwnerController.showVetList(java.Util.map)' AS initNewVisitForm,
-	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.initFindFormGet(java.Util.map)' AS service_X,
-	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.initFindFormGet()' AS service)
+LIST METRICS (	SERVICE 'org.springframework.samples.petclinic.web.WelcomeControllerHTTP.welcomeGET()' AS welcomeGET,
+	SERVICE 'org.springframework.samples.petclinic.web.VetController.showVetList(java.util.Map)' AS showVetListGET,
+	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.initFindFormGET(java.util.Map)' AS initFindFormGET,
+	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.processFindFormGET(org.springframework.samples.petclinic.model.Owner,org.springframework.validation.BindingResult,java.util.Map)' AS processFindFormGET,
+	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.showOwnerGET(int)' AS showOwnerGET)
 USING kieker@'C:\\Users\\Jürgen\\Desktop\\eclipse versions\\tools-descartes-dml-dev-environment-develop_2016_12_20\\git\\pmx-dml\\tools.descartes.pmx.dml.test\\testFiles\\pet-clinic\\kieker-20161206-103218336-UTC-petclinic-KIEKER-SINGLETON';
\ No newline at end of file
diff --git a/tools.descartes.dql.connector.kieker.examples/pet-clinic/SelectService.dql b/tools.descartes.dql.connector.kieker.examples/pet-clinic/SelectService.dql
index e339069a4eea989dc3b4b9832f6aa92c3945f335..402fc7eaede1c9a709b2b8bcf3beb4d3cda6a316 100644
--- a/tools.descartes.dql.connector.kieker.examples/pet-clinic/SelectService.dql
+++ b/tools.descartes.dql.connector.kieker.examples/pet-clinic/SelectService.dql
@@ -1,10 +1,13 @@
-SELECT welcomeGET_works.ResponseTime.DEFAULT
-FOR SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP' AS OwnerControllerHTTP,
-	SERVICE 'org.springframework.samples.petclinic.web.WelcomeControllerHTTP.welcomeGET()' AS welcomeGET_works,
-	SERVICE 'org.springframework.samples.petclinic.web.VetControllerHTTP.showVetListGET()' AS showVetList_X,
-	SERVICE 'org.springframework.samples.petclinic.web.VetController.showVetList()' AS showVetList,
-	SERVICE 'org.springframework.samples.petclinic.web.VetController.showVetList(java.Util.map)' AS showVetList2,
-	SERVICE 'org.springframework.samples.petclinic.web.OwnerController.showVetList(java.Util.map)' AS initNewVisitForm,
-	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.initFindFormGet(java.Util.map)' AS service_X,
-	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.initFindFormGet()' AS service
+SELECT 
+	welcomeGET.responseTime,
+	showVetListGET.responseTime,
+	initFindFormGET.responseTime,
+	processFindFormGET.responseTime,
+	showOwnerGET.responseTime
+FOR
+	SERVICE 'org.springframework.samples.petclinic.web.WelcomeControllerHTTP.welcomeGET()' AS welcomeGET,
+	SERVICE 'org.springframework.samples.petclinic.web.VetControllerHTTP.showVetListGET(java.util.Map)' AS showVetListGET,
+	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.initFindFormGET(java.util.Map)' AS initFindFormGET,
+	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.processFindFormGET(org.springframework.samples.petclinic.model.Owner,org.springframework.validation.BindingResult,java.util.Map)' AS processFindFormGET,
+	SERVICE 'org.springframework.samples.petclinic.web.OwnerControllerHTTP.showOwnerGET(int)' AS showOwnerGET
 USING kieker@'C:\\Users\\Jürgen\\Desktop\\eclipse versions\\tools-descartes-dml-dev-environment-develop_2016_12_20\\git\\pmx-dml\\tools.descartes.pmx.dml.test\\testFiles\\pet-clinic\\kieker-20161206-103218336-UTC-petclinic-KIEKER-SINGLETON';
\ No newline at end of file