diff --git a/packages/effect-fc/src/Component.ts b/packages/effect-fc/src/Component.ts
index 23eca29..75f3650 100644
--- a/packages/effect-fc/src/Component.ts
+++ b/packages/effect-fc/src/Component.ts
@@ -115,9 +115,9 @@ export namespace make {
                     [Eff] extends [never] ? never : [Eff] extends [Utils.YieldWrap<Effect.Effect<infer _A, infer _E, infer R>>] ? R : never
                 >,
                 props: NoInfer<P>,
-            ) => B
+            ) => B,
         ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<B>>, Effect.Effect.Error<B>, Effect.Effect.Context<B>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -128,8 +128,8 @@ export namespace make {
                 props: NoInfer<P>,
             ) => B,
             b: (_: B, props: NoInfer<P>) => C,
-        ): Component<P, Effect.Effect.Error<C>, Effect.Effect.Context<C>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<C>>, Effect.Effect.Error<C>, Effect.Effect.Context<C>>
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -141,8 +141,8 @@ export namespace make {
             ) => B,
             b: (_: B, props: NoInfer<P>) => C,
             c: (_: C, props: NoInfer<P>) => D,
-        ): Component<P, Effect.Effect.Error<D>, Effect.Effect.Context<D>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<D>>, Effect.Effect.Error<D>, Effect.Effect.Context<D>>
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -155,8 +155,8 @@ export namespace make {
             b: (_: B, props: NoInfer<P>) => C,
             c: (_: C, props: NoInfer<P>) => D,
             d: (_: D, props: NoInfer<P>) => E,
-        ): Component<P, Effect.Effect.Error<E>, Effect.Effect.Context<E>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<E>>, Effect.Effect.Error<E>, Effect.Effect.Context<E>>
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -170,8 +170,8 @@ export namespace make {
             c: (_: C, props: NoInfer<P>) => D,
             d: (_: D, props: NoInfer<P>) => E,
             e: (_: E, props: NoInfer<P>) => F,
-        ): Component<P, Effect.Effect.Error<F>, Effect.Effect.Context<F>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<F>>, Effect.Effect.Error<F>, Effect.Effect.Context<F>>
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -186,8 +186,8 @@ export namespace make {
             d: (_: D, props: NoInfer<P>) => E,
             e: (_: E, props: NoInfer<P>) => F,
             f: (_: F, props: NoInfer<P>) => G,
-        ): Component<P, Effect.Effect.Error<G>, Effect.Effect.Context<G>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G, H extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<G>>, Effect.Effect.Error<G>, Effect.Effect.Context<G>>
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G, H extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -203,8 +203,8 @@ export namespace make {
             e: (_: E, props: NoInfer<P>) => F,
             f: (_: F, props: NoInfer<P>) => G,
             g: (_: G, props: NoInfer<P>) => H,
-        ): Component<P, Effect.Effect.Error<H>, Effect.Effect.Context<H>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G, H, I extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<H>>, Effect.Effect.Error<H>, Effect.Effect.Context<H>>
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G, H, I extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -221,8 +221,8 @@ export namespace make {
             f: (_: F, props: NoInfer<P>) => G,
             g: (_: G, props: NoInfer<P>) => H,
             h: (_: H, props: NoInfer<P>) => I,
-        ): Component<P, Effect.Effect.Error<I>, Effect.Effect.Context<I>>
-        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G, H, I, J extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<I>>, Effect.Effect.Error<I>, Effect.Effect.Context<I>>
+        <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, A, B, C, D, E, F, G, H, I, J extends Effect.Effect<React.ReactNode, any, any>, P = never>(
             body: (props: P) => Generator<Eff, A, never>,
             a: (
                 _: Effect.Effect<
@@ -240,85 +240,85 @@ export namespace make {
             g: (_: G, props: NoInfer<P>) => H,
             h: (_: H, props: NoInfer<P>) => I,
             i: (_: I, props: NoInfer<P>) => J,
-        ): Component<P, Effect.Effect.Error<J>, Effect.Effect.Context<J>>
+        ): Component<P, Effect.Effect.Success<Effect.Effect.AsEffect<J>>, Effect.Effect.Error<J>, Effect.Effect.Context<J>>
     }
 
     export type NonGen = {
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
-            body: (props: P) => Eff
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => C,
-            c: (_: C, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => C,
-            c: (_: C, props: NoInfer<P>) => D,
-            d: (_: D, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => C,
-            c: (_: C, props: NoInfer<P>) => D,
-            d: (_: D, props: NoInfer<P>) => E,
-            e: (_: E, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => C,
-            c: (_: C, props: NoInfer<P>) => D,
-            d: (_: D, props: NoInfer<P>) => E,
-            e: (_: E, props: NoInfer<P>) => F,
-            f: (_: F, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, G, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => C,
-            c: (_: C, props: NoInfer<P>) => D,
-            d: (_: D, props: NoInfer<P>) => E,
-            e: (_: E, props: NoInfer<P>) => F,
-            f: (_: F, props: NoInfer<P>) => G,
-            g: (_: G, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, G, H, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => C,
-            c: (_: C, props: NoInfer<P>) => D,
-            d: (_: D, props: NoInfer<P>) => E,
-            e: (_: E, props: NoInfer<P>) => F,
-            f: (_: F, props: NoInfer<P>) => G,
-            g: (_: G, props: NoInfer<P>) => H,
-            h: (_: H, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
-        <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, G, H, I, P extends {} = {}>(
-            body: (props: P) => A,
-            a: (_: A, props: NoInfer<P>) => B,
-            b: (_: B, props: NoInfer<P>) => C,
-            c: (_: C, props: NoInfer<P>) => D,
-            d: (_: D, props: NoInfer<P>) => E,
-            e: (_: E, props: NoInfer<P>) => F,
-            f: (_: F, props: NoInfer<P>) => G,
-            g: (_: G, props: NoInfer<P>) => H,
-            h: (_: H, props: NoInfer<P>) => I,
-            i: (_: I, props: NoInfer<P>) => Eff,
-        ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, P extends {} = {}>(
+        //     body: (props: P) => Eff
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => C,
+        //     c: (_: C, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => C,
+        //     c: (_: C, props: NoInfer<P>) => D,
+        //     d: (_: D, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => C,
+        //     c: (_: C, props: NoInfer<P>) => D,
+        //     d: (_: D, props: NoInfer<P>) => E,
+        //     e: (_: E, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => C,
+        //     c: (_: C, props: NoInfer<P>) => D,
+        //     d: (_: D, props: NoInfer<P>) => E,
+        //     e: (_: E, props: NoInfer<P>) => F,
+        //     f: (_: F, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, G, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => C,
+        //     c: (_: C, props: NoInfer<P>) => D,
+        //     d: (_: D, props: NoInfer<P>) => E,
+        //     e: (_: E, props: NoInfer<P>) => F,
+        //     f: (_: F, props: NoInfer<P>) => G,
+        //     g: (_: G, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, G, H, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => C,
+        //     c: (_: C, props: NoInfer<P>) => D,
+        //     d: (_: D, props: NoInfer<P>) => E,
+        //     e: (_: E, props: NoInfer<P>) => F,
+        //     f: (_: F, props: NoInfer<P>) => G,
+        //     g: (_: G, props: NoInfer<P>) => H,
+        //     h: (_: H, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
+        // <Eff extends Effect.Effect<React.ReactNode, any, any>, A, B, C, D, E, F, G, H, I, P extends {} = {}>(
+        //     body: (props: P) => A,
+        //     a: (_: A, props: NoInfer<P>) => B,
+        //     b: (_: B, props: NoInfer<P>) => C,
+        //     c: (_: C, props: NoInfer<P>) => D,
+        //     d: (_: D, props: NoInfer<P>) => E,
+        //     e: (_: E, props: NoInfer<P>) => F,
+        //     f: (_: F, props: NoInfer<P>) => G,
+        //     g: (_: G, props: NoInfer<P>) => H,
+        //     h: (_: H, props: NoInfer<P>) => I,
+        //     i: (_: I, props: NoInfer<P>) => Eff,
+        // ): Component<P, Effect.Effect.Error<Eff>, Effect.Effect.Context<Eff>>
     }
 }