diff --git a/playground/app.vue b/playground/app.vue
index fdcf743..96a281b 100644
--- a/playground/app.vue
+++ b/playground/app.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-const { data, pending } = useLazyTrpcQuery('hello', undefined)
+const { data, pending } = useLazyTrpcQuery('getUser', {
+  name: 'roberts',
+})
 
 watchEffect(() => {
   console.log(data.value)
diff --git a/src/runtime/client.ts b/src/runtime/client.ts
index 292cc28..72a1f14 100644
--- a/src/runtime/client.ts
+++ b/src/runtime/client.ts
@@ -13,48 +13,49 @@ export function createTRPCComposables<
 >(
   client: Client
 ): {
-  useTrpcQuery: <TRouteKey extends TQuery>(
+  useTrpcQuery: <
+    TRouteKey extends TQuery,
+    ProcedureInput = inferProcedureInput<Router['_def']['queries'][TRouteKey]>,
+    ProcedureOutput = inferProcedureOutput<Router['_def']['queries'][TRouteKey]>,
+  >(
     args_0: TRouteKey,
-    args_1: inferProcedureInput<Router['_def']['queries'][TRouteKey]>
+    args_1: ProcedureInput
   ) => AsyncData<
     PickFrom<
-      inferProcedureOutput<Router['_def']['queries'][TRouteKey]>,
-      KeyOfRes<
-        _Transform<
-          inferProcedureOutput<Router['_def']['queries'][TRouteKey]>,
-          inferProcedureOutput<Router['_def']['queries'][TRouteKey]>
-        >
-      >
+      ProcedureOutput,
+      KeyOfRes<_Transform<ProcedureOutput, ProcedureOutput>>
     >,
     true | Error
   >
-  useLazyTrpcQuery: <TRouteKey extends TQuery>(
+  useLazyTrpcQuery: <
+    TRouteKey extends TQuery,
+    ProcedureInput = inferProcedureInput<Router['_def']['queries'][TRouteKey]>,
+    ProcedureOutput = inferProcedureOutput<Router['_def']['queries'][TRouteKey]>,
+  >(
     args_0: TRouteKey,
-    args_1: inferProcedureInput<Router['_def']['queries'][TRouteKey]>
+    args_1: ProcedureInput
   ) => AsyncData<
     PickFrom<
-      inferProcedureOutput<Router['_def']['queries'][TRouteKey]>,
-      KeyOfRes<
-        _Transform<
-          inferProcedureOutput<Router['_def']['queries'][TRouteKey]>,
-          inferProcedureOutput<Router['_def']['queries'][TRouteKey]>
-        >
-      >
+      ProcedureOutput,
+      KeyOfRes<_Transform<ProcedureOutput, ProcedureOutput>>
     >,
     true | Error
   >
-  useTrpcMutation: <TRouteKey extends TMutation>(
+  useTrpcMutation: <
+    TRouteKey extends TMutation,
+    ProcedureInput = inferProcedureInput<
+      Router['_def']['mutations'][TRouteKey]
+    >,
+    ProcedureOutput = inferProcedureOutput<
+      Router['_def']['mutations'][TRouteKey]
+    >,
+  >(
     args_0: TRouteKey,
-    args_1: inferProcedureInput<Router['_def']['mutations'][TRouteKey]>
+    args_1: ProcedureInput
   ) => AsyncData<
     PickFrom<
-      inferProcedureOutput<Router['_def']['mutations'][TRouteKey]>,
-      KeyOfRes<
-        _Transform<
-          inferProcedureOutput<Router['_def']['mutations'][TRouteKey]>,
-          inferProcedureOutput<Router['_def']['mutations'][TRouteKey]>
-        >
-      >
+      ProcedureOutput,
+      KeyOfRes<_Transform<ProcedureOutput, ProcedureOutput>>
     >,
     true | Error
   >