diff --git a/MediaStore/DQL-Queries/DMLListEntitiesQuery.dql b/MediaStore/DQL-Queries/DMLListEntitiesQuery.dql
deleted file mode 100644
index 7f1aa98ee0e81c2dabf1fc81f5abbc27b3dcea86..0000000000000000000000000000000000000000
--- a/MediaStore/DQL-Queries/DMLListEntitiesQuery.dql
+++ /dev/null
@@ -1,2 +0,0 @@
-LIST ENTITIES
-USING dml@'/MediaStore/default.properties';
\ No newline at end of file
diff --git a/MediaStore/DQL-Queries/DMLListMetrics.dql b/MediaStore/DQL-Queries/DMLListMetrics.dql
deleted file mode 100644
index 4fa62d5070e1424722e88e18c43786b88dd30a2d..0000000000000000000000000000000000000000
--- a/MediaStore/DQL-Queries/DMLListMetrics.dql
+++ /dev/null
@@ -1,3 +0,0 @@
-LIST METRICS (RESOURCE '_v3TAwA1REeWRk4cwFY6DiA' AS res1,
-			  SERVICE  'UploadSCA_ID' AS svc1) 
-USING dml@'/MediaStore/default.properties';
\ No newline at end of file
diff --git a/MediaStore/DQL-Queries/DMLSelectMetrics.dql b/MediaStore/DQL-Queries/DMLSelectMetrics.dql
index ead417267c374f5878283aff4ed470f4e2248276..55249090522299da357ae599435563d262ff010a 100644
--- a/MediaStore/DQL-Queries/DMLSelectMetrics.dql
+++ b/MediaStore/DQL-Queries/DMLSelectMetrics.dql
@@ -1,4 +1,14 @@
-SELECT res1.utilization, svc1.avgResponseTime
-FOR RESOURCE '_v3TAwA1REeWRk4cwFY6DiA' AS res1,
-			  SERVICE  'UploadSCA_ID' AS svc1
-USING dml@'/MediaStore/default.properties';
\ No newline at end of file
+SELECT DBServer_HDD.utilization, UploadSCA.avgResponseTime
+FOR	SERVICE	'UploadSCA_ID'	AS	UploadSCA,
+	SERVICE	'_gxHCUA3hEeWKC634F1E2dQ'	AS	defaultUsageScenario,
+	SERVICE	'DownloadSCA_id'	AS	DownloadSCA,
+	SERVICE	'_i7MecJapEeaocfbVsP-bZA'	AS	watermark,
+	SERVICE	'_H718EJapEeaocfbVsP-bZA'	AS	queryDB,
+	SERVICE	'_Iu3w8JaoEeaocfbVsP-bZA'	AS	upload,
+	SERVICE	'_cPcDAJanEeaocfbVsP-bZA'	AS	download,
+	SERVICE	'_LBjzAJatEeaocfbVsP-bZA'	AS	addFile,
+	RESOURCE	'_VG2d4SCpEeWxOb4Q3eQjzQ'	AS	DBServer_HDD,
+	RESOURCE	'_be1ToSCpEeWxOb4Q3eQjzQ'	AS	DBServer_CPU,
+	RESOURCE	'_tjH08SCoEeWxOb4Q3eQjzQ'	AS	AppServer_HDD,
+	RESOURCE	'_BoF_ISCpEeWxOb4Q3eQjzQ'	AS	AppServer_CPU
+USING dml@'default.properties';
\ No newline at end of file
diff --git a/MediaStore/DQL-Queries/default.properties b/MediaStore/DQL-Queries/default.properties
index 7a056e73be0992d8921e2adb5cb43b05a7a0ad12..1a9ce8a504a61d6edfa371011829ce0f710bbcae 100644
--- a/MediaStore/DQL-Queries/default.properties
+++ b/MediaStore/DQL-Queries/default.properties
@@ -1,7 +1,2 @@
-## Model Instance
-dml.files.usageprofile=/MediaStore/default.usageprofile
-dml.files.system=/MediaStore/default.system
-dml.files.resourcelandscape=/MediaStore/default.resourcelandscape
-dml.files.repository=/MediaStore/default.repository
-dml.files.deployment=/MediaStore/default.deployment
-#dml.outputdirectory=/MediaStore/results/
\ No newline at end of file
+dml.files.usageprofile=/../DML-Model/default.usageprofile
+dml.files.deployment=/../DML-Model/default.deployment
\ No newline at end of file