diff --git a/CN_PROD/slo/VDM_-_SFA_-_CN_PROD.tf b/CN_PROD/slo/VDM_-_SFA_-_CN_PROD.tf
index 9a7d5cc..5d39162 100644
--- a/CN_PROD/slo/VDM_-_SFA_-_CN_PROD.tf
+++ b/CN_PROD/slo/VDM_-_SFA_-_CN_PROD.tf
@@ -1,33 +1,67 @@
 module VDM_-_SFA_-_CN_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - SFA - CN PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-56D3EBD262A18BAC\",\"SERVICE_METHOD-8D593741180BCC8A\",\"SERVICE_METHOD-4418D6F2706C8293\",\"SERVICE_METHOD-AC333E97EC9784AD\",\"SERVICE_METHOD-658D8DBC8B9D46A3\",\"SERVICE_METHOD-A4EF6C019A81F4CF\")" 
-            
+    name                        = "VDM - SFA - CN PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Secure Feature Activation (SFA)"
+
+
+
+    #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(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W72.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W52.SFA_TOKEN_REQUEST_PROD~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W72.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VCNSEC_P.BMW.LOGISTIK.SFA.W52.SFA_TOKEN_REQUEST_PROD~"
+                        )"))))):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_-_SFA_-_EMEA_PROD.tf b/EMEA_PROD/slo/VDM_-_SFA_-_EMEA_PROD.tf
index 099abfd..1538a3f 100644
--- a/EMEA_PROD/slo/VDM_-_SFA_-_EMEA_PROD.tf
+++ b/EMEA_PROD/slo/VDM_-_SFA_-_EMEA_PROD.tf
@@ -1,33 +1,89 @@
 module VDM_-_SFA_-_EMEA_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - SFA - EMEA PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-67C9BD55D3A8F3C1\",\"SERVICE_METHOD-A645BB68D5566CB0\",\"SERVICE_METHOD-A98FDCF6B18706A7\",\"SERVICE_METHOD-25E490466F044725\",\"SERVICE_METHOD-1E8485D179B7285C\",\"SERVICE_METHOD-F26BD29CDFE41A29\",\"SERVICE_METHOD-4B5BE7901C17BD2A\",\"SERVICE_METHOD-959087063492C06D\",\"SERVICE_METHOD-8761950E1118B890\",\"SERVICE_METHOD-9538483B840B7C22\",\"SERVICE_METHOD-3FFFD77334A40D05\",\"SERVICE_METHOD-CD4571CE9AC53B1A\",\"SERVICE_METHOD-003D460F14407F26\",\"SERVICE_METHOD-7CF9A2A293FEA7FE\")" 
-            
+    name                        = "VDM - SFA - EMEA PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Secure Feature Activation (SFA)"
+
+
+
+    #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(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"SfaOtaResource - sfa - prod~",
+                                    ~"RuleSynchronizationResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"getNewestPackageForVehicle~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"updateTokenStatus~",
+                            ~"generateTokenPackage~",
+                            ~"syncRules~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.RW61.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.LW71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.DW24.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW11.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW15.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.BW31.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.PW18.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: temporary queue~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"SfaOtaResource - sfa - prod~",
+                                    ~"RuleSynchronizationResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"getNewestPackageForVehicle~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"updateTokenStatus~",
+                            ~"generateTokenPackage~",
+                            ~"syncRules~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.RW61.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.LW71.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.DW24.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW11.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.MW15.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.BW31.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: B2VSEC_P.BMW.LOGISTIK.SFA.PW18.SFA_TOKEN_REQUEST_PROD~",
+                            ~"Queue: temporary queue~"
+                        )"))))):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_-_SFA_-_US_PROD.tf b/NA_PROD/slo/VDM_-_SFA_-_US_PROD.tf
index 3c4ba59..200b4fd 100644
--- a/NA_PROD/slo/VDM_-_SFA_-_US_PROD.tf
+++ b/NA_PROD/slo/VDM_-_SFA_-_US_PROD.tf
@@ -1,33 +1,63 @@
 module VDM_-_SFA_-_US_PROD {
-    
+
     source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    
-    name                        = "VDM - SFA - US PROD" 
 
-    description                 = "" 
 
-    
-    
-    #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-56D3EBD262A18BAC\",\"SERVICE_METHOD-39272960E0087B38\",\"SERVICE_METHOD-8D593741180BCC8A\",\"SERVICE_METHOD-4418D6F2706C8293\",\"SERVICE_METHOD-BB275ADC214D588A\",\"SERVICE_METHOD-3551F578B26DE682\")" 
-            
+    name                        = "VDM - SFA - US PROD"
+
+    description                 = "Custom Vehicle Device Management (VDM) SLO for Secure Feature Activation (SFA)"
+
+
+
+    #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(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: temporary queue~"
+                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"PsdzResource - sfa - prod~",
+                                    ~"OrderHandlerResource - sfa - prod~",
+                                    ~"MQSession$FacadeMessageListener - sfa - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"generateTokenPackage~",
+                            ~"getPackageForOrder~",
+                            ~"generateTokenPackageForOrder~",
+                            ~"transferTokenStatusToEMEA~",
+                            ~"Queue: temporary queue~"
+                        )"))))):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