diff --git a/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf b/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf
index e352922..dd0093b 100644
--- a/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf
+++ b/CN_PROD/slo/VDM_-_NOP_-_CN_E2E.tf
@@ -1,33 +1,105 @@
 module VDM_-_NOP_-_CN_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOP - CN E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-3CB3A2433F27B21F\",\"SERVICE_METHOD-766BE84163D60870\",\"SERVICE_METHOD-6399F5576CA69AC5\",\"SERVICE_METHOD-0B6B2538C7FBDE3C\",\"SERVICE_METHOD-1A3DD4CA71E188AD\")" 
-            
+    name                        = "VDM - NOP - CN E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Next Online Provisioning (NOP)"
+
+
+
+    #entity selector object
+    filter                      = ""
+
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvisioningService - provisioning - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                    ~"ProvisioningService - nopprov - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: NOP_Trigger_IN-e2e~",
+                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvisioningService - provisioning - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                    ~"ProvisioningService - nopprov - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: NOP_Trigger_IN-e2e~",
+                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    evaluation                  = "AGGREGATE"
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
 }
\ No newline at end of file
diff --git a/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf b/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf
index 3967557..df67f31 100644
--- a/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf
+++ b/CN_PROD/slo/VDM_-_NOP_-_CN_PROD.tf
@@ -1,33 +1,105 @@
 module VDM_-_NOP_-_CN_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOP - CN PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-64687ED5BC6BB37B\",\"SERVICE_METHOD-589607CA2084D90D\",\"SERVICE_METHOD-A2DE0DFDD1D4484F\",\"SERVICE_METHOD-A4F450A127CA7BDB\",\"SERVICE_METHOD-E5008E8F279B39AF\",\"SERVICE_METHOD-0DB37B4A0C33F4D8\",\"SERVICE_METHOD-0FF622893881FE68\",\"SERVICE_METHOD-2B7B71C425E6EF39\")" 
-            
+    name                        = "VDM - NOP - CN PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Next Online Provisioning (NOP)"
+
+
+
+    #entity selector object
+    filter                      = ""
+
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvisioningService - provisioning - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                    ~"ProvisioningService - nopprov - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: NOP_Trigger_IN-prod~",
+                            ~"Queue: NOP_TRIGGER_ACK-prod~",
+                            ~"Queue: NOP_ARCHIVE_IN-prod~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvisioningService - provisioning - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                    ~"ProvisioningService - nopprov - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: NOP_Trigger_IN-prod~",
+                            ~"Queue: NOP_TRIGGER_ACK-prod~",
+                            ~"Queue: NOP_ARCHIVE_IN-prod~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    evaluation                  = "AGGREGATE"
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
 }
\ No newline at end of file
diff --git a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf
index 22cce29..bab50b8 100644
--- a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf
+++ b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_E2E.tf
@@ -1,33 +1,105 @@
 module VDM_-_NOP_-_EMEA_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOP - EMEA E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-89FFAC437E50848F\",\"SERVICE_METHOD-7997385FF904555E\",\"SERVICE_METHOD-ACC64A3192B3C131\",\"SERVICE_METHOD-A22447B0202527BD\",\"SERVICE_METHOD-2171152E34696423\",\"SERVICE_METHOD-D0EF02996045D2D7\",\"SERVICE_METHOD-45BB664F47003E15\",\"SERVICE_METHOD-1A3DD4CA71E188AD\")" 
-            
+    name                        = "VDM - NOP - EMEA E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Next Online Provisioning (NOP)"
+
+
+
+    #entity selector object
+    filter                      = ""
+
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvisioningService - provisioning - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                    ~"ProvisioningService - nopprov - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: NOP_Trigger_IN-e2e~",
+                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VINT.BMW.B2V.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvisioningService - provisioning - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                    ~"ProvisioningService - nopprov - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: NOP_Trigger_IN-e2e~",
+                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VINT.BMW.B2V.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    evaluation                  = "AGGREGATE"
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
 }
\ No newline at end of file
diff --git a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf
index 29b929e..9b5273e 100644
--- a/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf
+++ b/EMEA_PROD/slo/VDM_-_NOP_-_EMEA_PROD.tf
@@ -1,33 +1,105 @@
 module VDM_-_NOP_-_EMEA_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOP - EMEA PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-7A9EA8EDD89B1FD9\",\"SERVICE_METHOD-20139F0FE242F38A\",\"SERVICE_METHOD-728C4848FE0899DE\",\"SERVICE_METHOD-3354D893106FD184\",\"SERVICE_METHOD-E5008E8F279B39AF\",\"SERVICE_METHOD-0DB37B4A0C33F4D8\",\"SERVICE_METHOD-0FF622893881FE68\",\"SERVICE_METHOD-2B7B71C425E6EF39\")" 
-            
+    name                        = "VDM - NOP - EMEA PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Next Online Provisioning (NOP)"
+
+
+
+    #entity selector object
+    filter                      = ""
+
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvisioningService - provisioning - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                    ~"ProvisioningService - nopprov - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: NOP_Trigger_IN-prod~",
+                            ~"Queue: NOP_TRIGGER_ACK-prod~",
+                            ~"Queue: NOP_ARCHIVE_IN-prod~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvisioningService - provisioning - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                    ~"ProvisioningService - nopprov - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: NOP_Trigger_IN-prod~",
+                            ~"Queue: NOP_TRIGGER_ACK-prod~",
+                            ~"Queue: NOP_ARCHIVE_IN-prod~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VPROD.BMW.B2V.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    evaluation                  = "AGGREGATE"
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
 }
\ No newline at end of file
diff --git a/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf b/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf
index 4b9232c..8422604 100644
--- a/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf
+++ b/NA_PROD/slo/VDM_-_NOP_-_US_E2E.tf
@@ -1,33 +1,105 @@
 module VDM_-_NOP_-_US_E2E {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOP - US E2E" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-7CC70DCD0190B046\",\"SERVICE_METHOD-72B5789D84452BBF\",\"SERVICE_METHOD-4D1626BF0073BF27\",\"SERVICE_METHOD-458A51A6775B7ADF\",\"SERVICE_METHOD-1A3DD4CA71E188AD\")" 
-            
+    name                        = "VDM - NOP - US E2E"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Next Online Provisioning (NOP)"
+
+
+
+    #entity selector object
+    filter                      = ""
+
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvisioningService - provisioning - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                    ~"ProvisioningService - nopprov - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: NOP_Trigger_IN-e2e~",
+                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvisioningService - provisioning - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                    ~"ProvisioningService - nopprov - e2e~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: NOP_Trigger_IN-e2e~",
+                            ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                            ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    evaluation                  = "AGGREGATE"
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
 }
\ No newline at end of file
diff --git a/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf b/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf
index a454abd..238954b 100644
--- a/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf
+++ b/NA_PROD/slo/VDM_-_NOP_-_US_PROD.tf
@@ -1,33 +1,105 @@
 module VDM_-_NOP_-_US_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - NOP - US PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-204C40F1CB4FF7F7\",\"SERVICE_METHOD-78A96EAD07EF5109\",\"SERVICE_METHOD-9CF0CC508CA77D57\",\"SERVICE_METHOD-37B9A98B72A7A352\",\"SERVICE_METHOD-E5008E8F279B39AF\",\"SERVICE_METHOD-0DB37B4A0C33F4D8\",\"SERVICE_METHOD-0FF622893881FE68\",\"SERVICE_METHOD-2B7B71C425E6EF39\")" 
-            
+    name                        = "VDM - NOP - US PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Next Online Provisioning (NOP)"
+
+
+
+    #entity selector object
+    filter                      = ""
+
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
- 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvisioningService - provisioning - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                    ~"ProvisioningService - nopprov - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: NOP_Trigger_IN-prod~",
+                            ~"Queue: NOP_TRIGGER_ACK-prod~",
+                            ~"Queue: NOP_ARCHIVE_IN-prod~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvisioningService - provisioning - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+
+                                    ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                    ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                    ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                    ~"ProvisioningService - nopprov - prod~",
+                                    ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: NOP_Trigger_IN-prod~",
+                            ~"Queue: NOP_TRIGGER_ACK-prod~",
+                            ~"Queue: NOP_ARCHIVE_IN-prod~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~",
+
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_ARCHIV_IN~",
+                            ~"getNOPProvisioningDataForVehicle~",
+                            ~"getNOPProvisioningDataForVehicleBase64~",
+                            ~"acknowledgeNOPProvisioningDownload~",
+                            ~"/nop-prov/v2/mainprov/prov.do~"
+                        )"))))):splitBy()))
+    EOT
+
+
+    #if not set (removed) it's defaulted to "-1d"
+    timeframe                   = "-1d"
 
-    #if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
 
     #currently the only possible value
-    evaluation                  = "AGGREGATE"           
+    evaluation                  = "AGGREGATE"
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
-    
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
+
 }
\ No newline at end of file