diff --git a/cleanW10.ps1 b/cleanW10.ps1
index aae06e3..b2eb039 100755
--- a/cleanW10.ps1
+++ b/cleanW10.ps1
@@ -456,7 +456,16 @@ function DisableService {
                 return
             }
             Stop-Service -InputObject $service -PassThru | Set-Service -StartupType disabled
-            Write-Host -ForegroundColor Green "done "
+            Write-Host -ForegroundColor Green "done"
+            if ( $params.userService ) {
+                # For this kind of service, we need to add a key t create a user service
+                # Where user log-in.
+                AddRegKey @{
+                    path="HKLM:\SYSTEM\CurrentControlSet\Services\$($params.name)";
+                    key="UserServiceFlags"
+                    value="0"
+                }
+            }
         }
         catch {
             Write-Host -NoNewLine -ForegroundColor Red "`tError`n`t"
diff --git a/modules.d/SER_Sensors.conf b/modules.d/SER_Sensors.conf
new file mode 100644
index 0000000..1696770
--- /dev/null
+++ b/modules.d/SER_Sensors.conf
@@ -0,0 +1,21 @@
+{
+    "name" : "Sensors Services",
+    "description" : "Disable sensors related services should impact orientation, auto-brightness orientation etc.",
+    "actions" : [
+        {
+            "_comment" : "disable sensors service",
+            "action" : "disableservices",
+            "name" : "sensorservice"
+        },
+        {
+            "_comment" : "Disable sensors monitoring service",
+            "action" : "disableservices",
+            "name" : "SensrSvc"
+        },
+        {
+            "_comment" : "Disable sensors data  service",
+            "action" : "disableservices",
+            "name" : "SensorDataService"
+        }
+    ]
+}
diff --git a/modules.d/SER_Users.conf b/modules.d/SER_Users.conf
new file mode 100644
index 0000000..d402b34
--- /dev/null
+++ b/modules.d/SER_Users.conf
@@ -0,0 +1,49 @@
+{
+    "name" : "User services",
+    "description" : "User specific services, ones ends with ????? need to be disable per account",
+    "actions" : 
+    [
+        { 
+            "_comment" : "Disable sync service (useful for calendars, contact, mesaging and other sync applications)",
+            "action" : "DisableService",
+            "name" : "OneSyncSvc",
+            "userService" : "True"
+        },
+        {
+            "_comment" : "Disable connected user platform service",
+            "action" : "DisableService",
+            "name" : "CDPUserSvc",
+            "userService" : "True"
+        },
+        {
+            "_comment" : "Disable messaging service",
+            "action" : "DisableService",
+            "name" : "MessagingService",
+            "userService" : "True"
+        },
+        {
+            "_comment" : "Disable contact data  service",
+            "action" : "DisableService",
+            "name" : "PimIndexMaintenanceSvc",
+            "userService" : "True"
+        },
+        {
+            "_comment" : "Disable contact data service",
+            "action" : "DisableService",
+            "name" : "UnistoreSvc",
+            "userService" : "True"
+        },
+        {
+            "_comment" : "Disable user data sharing service",
+            "action" : "DisableService",
+            "name" : "UserDataSvc",
+            "userService" : "True"
+        },
+        {
+            "_comment" : "Disable contact data service",
+            "action" : "DisableService",
+            "name" : "WpnUserService",
+            "userService" : "True"
+        }
+    ]
+}
diff --git a/modules.d/SER_VariousServices.conf b/modules.d/SER_VariousServices.conf
new file mode 100644
index 0000000..54777ab
--- /dev/null
+++ b/modules.d/SER_VariousServices.conf
@@ -0,0 +1,22 @@
+{
+    "name" : "Remove Services",
+    "description" : "",
+    "actions" : [
+        {
+            "_comment" : "Disable most diagnostic related services",
+            "action" : "DisableServices",
+            "file" : "DiagServices.txt",
+            "firewall" : "True"
+        },
+        {
+            "_comment" : "Disable Biometric service",
+            "action" : "DisableService",
+            "name" : "WbioSrvc"
+        },
+        {
+            "_comment" : "Disable Windows Licence Manager",
+            "action" : "DisableService",
+            "name" : "LicenseManager"
+        }
+    ]
+}
diff --git a/modules.d/SER_VariousServices/DiagServices.txt b/modules.d/SER_VariousServices/DiagServices.txt
new file mode 100644
index 0000000..24e975b
--- /dev/null
+++ b/modules.d/SER_VariousServices/DiagServices.txt
@@ -0,0 +1,4 @@
+DiagTrack
+dmwappushservice
+diagnosticshub.standardcollector.service
+RetailDemo
diff --git a/modules.d/UninstallModernApp/XboxServices.txt b/modules.d/UninstallModernApp/XboxServices.txt
index 8a7a7ae..1a59b98 100644
--- a/modules.d/UninstallModernApp/XboxServices.txt
+++ b/modules.d/UninstallModernApp/XboxServices.txt
@@ -1,4 +1,5 @@
 XblAuthManager
 XblGameSave
 XboxNetApiSvc
+xboxgip
 XboxGipSvc