diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
index 57576014..a04c1013 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
@@ -1,55 +1,52 @@
 config:
-- customService1: template-2-1a.json
-- customService2: template-2-1b.json
-- customService3: template-1-1a.json
-- customService4: template-1-1b.json
-- customService5: template-1-1c.json
-- customService6: template-1-1d.json
+- customService1: template-2-1.json
+- customService2: template-2-1.json
+- customService3: template-1-1.json
+- customService4: template-1-1-without-methodargs.json
+- customService5: template-1-1-without-methodargs.json
 
 customService1:
-- name: "VDLM_rtchandler - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT"
+- name: "ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT"
 - className1: com.bmw.cc.ts.rtchandler.bm.message.MessageServiceRTCBF
 - methodName1: processMessage
+- methodArgs1: java.lang.String,java.util.Map,com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext
 - returnType1: void
 - className2: com.bmw.cc.ts.rtchandler.integration.tsmb.boundary.TeleXSqsESI
 - methodName2: sendMessage
+- methodArgs2: java.lang.String,java.util.Map,com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext
 - returnType2: void
 - skipDeployment: "false"
 
 customService2:
-- name: "VDLM_rtchandler - ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT"
+- name: "ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT"
 - className1: com.bmw.cc.ts.rtchandler.api.ngtp.v1.boundary.NgtpSqsListener
 - methodName1: processMessage
+- methodArgs1: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message
 - returnType1: void
 - className2: com.bmw.cc.ts.rtchandler.integration.ngtp.v1.boundary.NgtpSqsESI
 - methodName2: sendMessage
+- methodArgs2: java.lang.String,java.lang.String,com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType
 - returnType2: void
 - skipDeployment: "false"
 
 customService3:
-- name: "VDLM_rtchandler - ifs-009 (MQS) RtcHandlerIstaOut - OUT"
+- name: "ifs-009 (MQS) RtcHandlerIstaOut - OUT"
 - className: com.bmw.cc.ts.rtchandler.bm.common.control.classificationrequest.ClassificationRequestQueueSender
 - methodName: sendClassificationRequestMessage
+- methodArgs: com.bmw.cc.ts.rtchandler.bm.common.model.classificationrequest.ClassificationRequest
 - returnType: void
 - skipDeployment: "false"
 
 customService4:
-- name: "VDLM_rtchandler - (Timer) timeout"
+- name: "(Timer) timeout"
 - className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService
 - methodName: handleTimer
 - returnType: void
 - skipDeployment: "false"
 
 customService5:
-- name: "VDLM_rtchandler - (Timer) deletion"
+- name: "(Timer) deletion"
 - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA
 - methodName: cleanUp
 - returnType: void
-- skipDeployment: "false"
-
-customService6:
-- name: "VDLM_rtchandler - ifs-007 (REST) /rtchandler/rest/diag/v2 (/trigger)"
-- className: com.bmw.cc.ts.rtchandler.api.diag.v2.boundary.DiagRequestResponseV2
-- methodName: trigger
-- returnType: void
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1-without-methodargs.json
similarity index 93%
rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json
rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1-without-methodargs.json
index 1fd760ba..b3003515 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1-without-methodargs.json
@@ -13,7 +13,7 @@
    "matcher": "EQUALS",
    "methodRules": [
     {
-     "argumentTypes": [ ],
+     "argumentTypes": [],
      "methodName": "{{.methodName}}",
      "returnType": "{{.returnType}}"
     }
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json
similarity index 89%
rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json
rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json
index 1fd760ba..ebe95097 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json
@@ -13,7 +13,7 @@
    "matcher": "EQUALS",
    "methodRules": [
     {
-     "argumentTypes": [ ],
+     "argumentTypes": ["{{.methodArgs}}"],
      "methodName": "{{.methodName}}",
      "returnType": "{{.returnType}}"
     }
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json
deleted file mode 100644
index fb870862..00000000
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "enabled": true,
- "name": "{{.name}}",
- "processGroups": [],
- "queueEntryPoint": false,
- "queueEntryPointType": null,
- "rules": [
-  {
-   "annotations": [],
-   "className": "{{.className}}",
-   "enabled": true,
-   "fileName": "",
-   "matcher": "EQUALS",
-   "methodRules": [
-    {
-     "argumentTypes": [
-      "com.bmw.cc.ts.rtchandler.bm.common.model.classificationrequest.ClassificationRequest"
-     ],
-     "methodName": "{{.methodName}}",
-     "returnType": "{{.returnType}}"
-    }
-   ]
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json
deleted file mode 100644
index c817d637..00000000
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "enabled": true,
- "name": "{{.name}}",
- "processGroups": [],
- "queueEntryPoint": false,
- "queueEntryPointType": null,
- "rules": [
-  {
-   "annotations": [],
-   "className": "{{.className}}",
-   "enabled": true,
-   "fileName": "",
-   "matcher": "EQUALS",
-   "methodRules": [
-    {
-     "argumentTypes": [
-      "com.bmw.cc.ts.rtchandler.api.diag.v2.entity.RTCTriggerRequest"
-     ],
-     "methodName": "{{.methodName}}",
-     "returnType": "{{.returnType}}"
-    }
-   ]
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json
similarity index 67%
rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json
rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json
index f6873db3..f0077b0c 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json
@@ -13,10 +13,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": [
-            "com.bmw.cd.logging.CdllLoggingContext",
-            "software.amazon.awssdk.services.sqs.model.Message"
-          ],
+          "argumentTypes": ["{{.methodArgs1}}"],
           "methodName": "{{.methodName1}}",
           "returnType": "{{.returnType1}}"
         }]
@@ -29,11 +26,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": [
-            "java.lang.String",
-            "java.lang.String",
-            "com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType"
-          ],
+          "argumentTypes": ["{{.methodArgs2}}"],
           "methodName": "{{.methodName2}}",
           "returnType": "{{.returnType2}}"
         }
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-2-without-methodargs.json
similarity index 67%
rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json
rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-2-without-methodargs.json
index 62c8d7a4..7ed95c38 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-2-without-methodargs.json
@@ -13,11 +13,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": [
-            "java.lang.String",
-            "java.util.Map",
-            "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext"
-          ],
+     	  "argumentTypes": [],
           "methodName": "{{.methodName1}}",
           "returnType": "{{.returnType1}}"
         }]
@@ -30,11 +26,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": [
-            "java.lang.String",
-            "java.util.Map",
-            "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext"
-          ],
+          "argumentTypes": [],
           "methodName": "{{.methodName2}}",
           "returnType": "{{.returnType2}}"
         }
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/default.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/default.json
new file mode 100644
index 00000000..b21018bc
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/default.json
@@ -0,0 +1,36 @@
+{
+  "type": "FULL_WEB_SERVICE",
+  "metadata": {
+    "configurationVersions": [
+      0
+    ],
+    "clusterVersion": "1.241.180.20220520-165831"
+  },
+  "managementZones": ["{{.managementZone}}"],
+  "name": "{{.name}}",
+  "description": "{{.description}}",
+  "enabled": true,
+  "conditions": [
+    {
+      "attributeType": "WEBSERVICE_NAME",
+      "compareOperations": [
+        {
+          "type": "EQUALS",
+          "negate": false,
+          "ignoreCase": false,
+          "values": [
+            "{{.originalName}}"
+          ]
+        }
+      ]
+    }
+  ],
+  "detectAsWebRequestService": false,
+  "webServiceName": {
+    "transformations": [],
+    "valueOverride": "{{.valueOverride}}"
+  },
+  "applicationId": null,
+  "contextRoot": null,
+   "serverName": null
+}
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/service-detection-full-web-service.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/service-detection-full-web-service.yaml
new file mode 100644
index 00000000..0dbaae4c
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/service-detection-full-web-service.yaml
@@ -0,0 +1,26 @@
+config:
+- webService1: default.json
+- webService2: default.json
+- webService3: default.json
+
+webService1:
+- name: "DiagRequestResponseV2 rule"
+- description: "Renaming Service DiagRequestResponseV2"
+- managementZone: "CD_VDLM_rtchandler"
+- originalName: "DiagRequestResponseV2"
+- valueOverride: "ifs-007 (REST) /rtchandler/rest/diag/v2 (/trigger)"
+
+webService2:
+- name: "DiagRequestApiV2 rule"
+- description: "Renaming Service DiagRequestApiV2"
+- managementZone: "CD_VDLM_rtchandler"
+- originalName: "DiagRequestApiV2"
+- valueOverride: "ifs-002 (REST) /rtchandler/rest/diagrequests/v2"
+
+webService3:
+- name: "WhitelistApiV1 rule"
+- description: "Renaming Service WhitelistApiV1"
+- managementZone: "CD_VDLM_rtchandler"
+- originalName: "WhitelistApiV1"
+- valueOverride: "ifs-003 (REST) /rtchandler/rest/whitelist/v1"
+