diff --git a/src/Layers/trpc/TRPCExpressRoute.ts b/src/Layers/trpc/TRPCExpressRoute.ts
index 66bface..62cca46 100644
--- a/src/Layers/trpc/TRPCExpressRoute.ts
+++ b/src/Layers/trpc/TRPCExpressRoute.ts
@@ -10,8 +10,11 @@ const importTRPCServerExpressAdapter = Effect.tryPromise({
     catch: cause => new ImportError({ path: "@trpc/server/adapters/express", cause }),
 })
 
-export const TRPCExpressRouteLive = <T extends AnyRouter>(
-    routerTag: Context.Tag<"@thilalib/TRCP/TRPCRouter", T>,
+export const TRPCExpressRouteLive = <
+    Tag,
+    TagShape extends AnyRouter,
+>(
+    routerTag: Context.TagClass<Tag, "@thilalib/TRCP/TRPCRouter", TagShape>,
 
     config: {
         readonly root: Config.Config<string>
diff --git a/src/Layers/trpc/TRPCWebSocketServer.ts b/src/Layers/trpc/TRPCWebSocketServer.ts
index 64169ad..19eb7be 100644
--- a/src/Layers/trpc/TRPCWebSocketServer.ts
+++ b/src/Layers/trpc/TRPCWebSocketServer.ts
@@ -18,12 +18,15 @@ const importTRPCServerWSAdapter = Effect.tryPromise({
 })
 
 
-export const make = <T extends AnyRouter>(
-    routerTag: Context.Tag<"@thilalib/TRCP/TRPCRouter", T>
+export const make = <
+    Tag,
+    TagShape extends AnyRouter,
+>(
+    routerTag: Context.TagClass<Tag, "@thilalib/TRCP/TRPCRouter", TagShape>
 ) => {
     class TRPCWebSocketServer extends Context.Tag("@thilalib/TRPC/TRPCWebSocketServer")<TRPCWebSocketServer, {
         wss:      ws.Server
-        handler:  ReturnType<typeof applyWSSHandler<T>>
+        handler:  ReturnType<typeof applyWSSHandler<TagShape>>
     }>() {}
 
     const TRPCWebSocketServerLive = (