diff --git a/packages/effect-fc-next/src/Mutation.ts b/packages/effect-fc-next/src/Mutation.ts
index 5ae14d4..6ad8140 100644
--- a/packages/effect-fc-next/src/Mutation.ts
+++ b/packages/effect-fc-next/src/Mutation.ts
@@ -7,7 +7,7 @@ import type * as Subscribable from "./Subscribable.js"
 export const MutationTypeId: unique symbol = Symbol.for("@effect-fc/Mutation/Mutation")
 export type MutationTypeId = typeof MutationTypeId
 
-export interface Mutation<in out K extends Mutation.AnyKey, in out A, in out E = never, in out R = never>
+export interface Mutation<in out K, in out A, in out E = never, in out R = never>
 extends Pipeable.Pipeable {
     readonly [MutationTypeId]: MutationTypeId
 
@@ -23,11 +23,10 @@ extends Pipeable.Pipeable {
     mutateSubscribable(key: K): Effect.Effect<Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>>
 }
 
-export declare namespace Mutation {
-    export type AnyKey = readonly any[]
-}
+export const isMutation = (u: unknown): u is Mutation<unknown, unknown, unknown, unknown> => Predicate.hasProperty(u, MutationTypeId)
 
-export class MutationImpl<in out K extends Mutation.AnyKey, in out A, in out E = never, in out R = never>
+
+export class MutationImpl<in out K, in out A, in out E = never, in out R = never>
 extends Pipeable.Class implements Mutation<K, A, E, R> {
     readonly [MutationTypeId]: MutationTypeId = MutationTypeId
 
@@ -129,16 +128,13 @@ extends Pipeable.Class implements Mutation<K, A, E, R> {
 }
 
 
-export const isMutation = (u: unknown): u is Mutation<readonly unknown[], unknown, unknown, unknown> => Predicate.hasProperty(u, MutationTypeId)
-
-
 export declare namespace make {
-    export interface Options<K extends Mutation.AnyKey = never, A = void, E = never, R = never> {
+    export interface Options<K = never, A = void, E = never, R = never> {
         readonly f: (key: K) => Effect.Effect<A, E, R>
     }
 }
 
-export const make = Effect.fnUntraced(function* <const K extends Mutation.AnyKey = never, A = void, E = never, R = never>(
+export const make = Effect.fnUntraced(function* <K = never, A = void, E = never, R = never>(
     options: make.Options<K, A, E, R>
 ): Effect.fn.Return<
     Mutation<K, A, E, R>,
diff --git a/packages/effect-fc-next/src/Query.ts b/packages/effect-fc-next/src/Query.ts
index 27a6531..6e7d589 100644
--- a/packages/effect-fc-next/src/Query.ts
+++ b/packages/effect-fc-next/src/Query.ts
@@ -8,7 +8,7 @@ import * as Subscribable from "./Subscribable.js"
 export const QueryTypeId: unique symbol = Symbol.for("@effect-fc/Query/Query")
 export type QueryTypeId = typeof QueryTypeId
 
-export interface Query<in out K extends Query.AnyKey, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never>
+export interface Query<in out K, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never>
 extends Pipeable.Pipeable {
     readonly [QueryTypeId]: QueryTypeId
 
@@ -34,11 +34,10 @@ extends Pipeable.Pipeable {
     invalidateCacheEntry(key: K): Effect.Effect<void>
 }
 
-export declare namespace Query {
-    export type AnyKey = readonly any[]
-}
+export const isQuery = (u: unknown): u is Query<unknown, unknown, unknown, unknown, unknown, unknown> => Predicate.hasProperty(u, QueryTypeId)
 
-export class QueryImpl<in out K extends Query.AnyKey, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never>
+
+export class QueryImpl<in out K, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never>
 extends Pipeable.Class implements Query<K, A, KE, KR, E, R> {
     readonly [QueryTypeId]: QueryTypeId = QueryTypeId
 
@@ -239,7 +238,7 @@ extends Pipeable.Class implements Query<K, A, KE, KR, E, R> {
     }
 
     makeCacheKey(key: K): QueryClient.QueryClientCacheKey {
-        return new QueryClient.QueryClientCacheKey(key, this.f as (key: Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>)
+        return new QueryClient.QueryClientCacheKey(key, this.f as (key: unknown) => Effect.Effect<unknown, unknown, unknown>)
     }
 
     getCacheEntry(
@@ -269,7 +268,7 @@ extends Pipeable.Class implements Query<K, A, KE, KR, E, R> {
 
     get invalidateCache(): Effect.Effect<void> {
         return QueryClient.QueryClient.pipe(
-            Effect.andThen(client => client.invalidateCacheEntries(this.f as (key: Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>)),
+            Effect.andThen(client => client.invalidateCacheEntries(this.f as (key: unknown) => Effect.Effect<unknown, unknown, unknown>)),
             Effect.provide(this.context),
         )
     }
@@ -285,12 +284,8 @@ extends Pipeable.Class implements Query<K, A, KE, KR, E, R> {
     }
 }
 
-
-export const isQuery = (u: unknown): u is Query<readonly unknown[], unknown, unknown, unknown, unknown, unknown> => Predicate.hasProperty(u, QueryTypeId)
-
-
 export declare namespace make {
-    export interface Options<K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never> {
+    export interface Options<K, A, KE = never, KR = never, E = never, R = never> {
         readonly key: Stream.Stream<K, KE, KR>
         readonly f: (key: NoInfer<K>) => Effect.Effect<A, E, R>
         readonly staleTime?: Duration.Input
@@ -298,7 +293,7 @@ export declare namespace make {
     }
 }
 
-export const make = Effect.fnUntraced(function* <K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never>(
+export const make = Effect.fnUntraced(function* <K, A, KE = never, KR = never, E = never, R = never>(
     options: make.Options<K, A, KE, KR, E, R>
 ): Effect.fn.Return<
     Query<K, A, KE, KR, E, R>,
@@ -324,7 +319,7 @@ export const make = Effect.fnUntraced(function* <K extends Query.AnyKey, A, KE =
     )
 })
 
-export const service = <K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never>(
+export const service = <K, A, KE = never, KR = never, E = never, R = never>(
     options: make.Options<K, A, KE, KR, E, R>
 ): Effect.Effect<
     Query<K, A, KE, KR, E, R>,
diff --git a/packages/effect-fc-next/src/QueryClient.ts b/packages/effect-fc-next/src/QueryClient.ts
index 61dcf59..2405cbd 100644
--- a/packages/effect-fc-next/src/QueryClient.ts
+++ b/packages/effect-fc-next/src/QueryClient.ts
@@ -1,7 +1,6 @@
 import { type Cause, Context, DateTime, Duration, Effect, Equal, Equivalence, Hash, HashMap, type Option, Pipeable, Predicate, Schedule, type Scope, Semaphore, SubscriptionRef } from "effect"
 import type { AsyncResult } from "effect/unstable/reactivity"
 import * as Lens from "./Lens.js"
-import type * as Query from "./Query.js"
 import type * as Subscribable from "./Subscribable.js"
 
 
@@ -23,7 +22,7 @@ export interface QueryClientService extends Pipeable.Pipeable {
         result: AsyncResult.Success<unknown, unknown>,
         staleTime: Duration.Duration,
     ): Effect.Effect<QueryClientCacheEntry>
-    invalidateCacheEntries(f: (key: Query.Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void>
+    invalidateCacheEntries(f: (key: unknown) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void>
     invalidateCacheEntry(key: QueryClientCacheKey): Effect.Effect<void>
 }
 
@@ -86,7 +85,7 @@ implements QueryClientService {
         )
     }
 
-    invalidateCacheEntries(f: (key: Query.Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void> {
+    invalidateCacheEntries(f: (key: unknown) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void> {
         return Lens.update(this.cache, HashMap.filter((_, key) => !Equivalence.strictEqual()(key.f, f)))
     }
     invalidateCacheEntry(key: QueryClientCacheKey): Effect.Effect<void> {
@@ -137,17 +136,17 @@ implements Pipeable.Pipeable, Equal.Equal {
     readonly [QueryClientCacheKeyTypeId]: QueryClientCacheKeyTypeId = QueryClientCacheKeyTypeId
 
     constructor(
-        readonly key: Query.Query.AnyKey,
-        readonly f: (key: Query.Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>,
+        readonly key: unknown,
+        readonly f: (key: unknown) => Effect.Effect<unknown, unknown, unknown>,
     ) {
         super()
     }
 
     [Equal.symbol](that: Equal.Equal) {
-        return isQueryClientCacheKey(that) && Equivalence.Array(Equal.asEquivalence())(this.key, that.key) && Equivalence.strictEqual()(this.f, that.f)
+        return isQueryClientCacheKey(that) && Equal.equals(this.key, that.key) && Equivalence.strictEqual()(this.f, that.f)
     }
     [Hash.symbol]() {
-        return Hash.combine(Hash.hash(this.f))(Hash.array(this.key))
+        return Hash.combine(Hash.hash(this.f))(Hash.hash(this.key))
     }
 }