diff --git a/assets/TenancyServiceProvider.stub.php b/assets/TenancyServiceProvider.stub.php
index 711fd0f4..fa7d035d 100644
--- a/assets/TenancyServiceProvider.stub.php
+++ b/assets/TenancyServiceProvider.stub.php
@@ -83,6 +83,11 @@ class TenancyServiceProvider extends ServiceProvider
             Events\SyncedResourceSaved::class => [
                 Listeners\UpdateSyncedResource::class,
             ],
+
+            // Fired only when a synced resource is changed in a different DB than the origin DB (to avoid infinite loops)
+            Events\SyncedResourceChangedInForeignDatabase::class => [
+
+            ],
         ];
     }
 
diff --git a/src/Features/UniversalRoutes.php b/src/Features/UniversalRoutes.php
index f41964e6..b9aa0bad 100644
--- a/src/Features/UniversalRoutes.php
+++ b/src/Features/UniversalRoutes.php
@@ -8,13 +8,15 @@ use Closure;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Route as Router;
 use Stancl\Tenancy\Contracts\Feature;
-use Stancl\Tenancy\Middleware\InitializeTenancyByDomain;
+use Stancl\Tenancy\Middleware;
 use Stancl\Tenancy\Tenancy;
 
 class UniversalRoutes implements Feature
 {
     public static $identificationMiddlewares = [
-        InitializeTenancyByDomain::class,
+        Middleware\InitializeTenancyByDomain::class,
+        Middleware\InitializeTenancyBySubdomain::class,
+        Middleware\InitializeTenancyByDomainOrSubdomain::class,
     ];
 
     public function bootstrap(Tenancy $tenancy): void