diff --git a/libafl/src/corpus/minimizer.rs b/libafl/src/corpus/minimizer.rs
index 0e513863df..321124494c 100644
--- a/libafl/src/corpus/minimizer.rs
+++ b/libafl/src/corpus/minimizer.rs
@@ -38,7 +38,6 @@ pub type StdCorpusMinimizer<C, E, O, T> = MapCorpusMinimizer<C, E, O, T, LenTime
 
 impl<C, E, O, T, TS> MapCorpusMinimizer<C, E, O, T, TS>
 where
-    E: UsesState,
     E::State: HasCorpus + HasMetadata,
     TS: TestcaseScore<E::State>,
     C: Named,
@@ -55,7 +54,6 @@ where
 
 impl<C, E, O, T, TS> MapCorpusMinimizer<C, E, O, T, TS>
 where
-    E: UsesState,
     for<'a> O: MapObserver<Entry = T> + AsIter<'a, Item = T>,
     C: AsRef<O>,
     E::State: HasMetadata + HasCorpus + HasExecutions,
diff --git a/libafl/src/events/centralized.rs b/libafl/src/events/centralized.rs
index 9d818e8686..d61dc76172 100644
--- a/libafl/src/events/centralized.rs
+++ b/libafl/src/events/centralized.rs
@@ -367,7 +367,7 @@ impl<E, EM, EMH, S, SP, Z> EventProcessor<E, Z> for CentralizedEventManager<EM,
 where
     EM: AdaptiveSerializer + EventProcessor<E, Z> + EventFirer<State = S> + HasEventManagerId,
     EMH: EventManagerHooksTuple<S>,
-    E: HasObservers + Executor<Self, Z, State = Self::State>,
+    E: HasObservers + Executor<Self, <S::Corpus as Corpus>::Input, S, Z>,
     E::Observers:
         ObserversTuple<<Self as UsesInput>::Input, <Self as UsesState>::State> + Serialize,
     for<'a> E::Observers: Deserialize<'a>,
@@ -402,7 +402,7 @@ where
 
 impl<E, EM, EMH, S, SP, Z> EventManager<E, Z> for CentralizedEventManager<EM, EMH, S, SP>
 where
-    E: HasObservers + Executor<Self, Z, State = Self::State>,
+    E: HasObservers + Executor<Self, <S::Corpus as Corpus>::Input, S, Z>,
     E::Observers:
         ObserversTuple<<Self as UsesInput>::Input, <Self as UsesState>::State> + Serialize,
     for<'a> E::Observers: Deserialize<'a>,
@@ -532,7 +532,7 @@ where
         executor: &mut E,
     ) -> Result<usize, Error>
     where
-        E: Executor<Self, Z, State = <Self as UsesState>::State> + HasObservers,
+        E: Executor<Self, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
         E::Observers:
             ObserversTuple<<Self as UsesInput>::Input, <Self as UsesState>::State> + Serialize,
         <Self as UsesState>::State: UsesInput + HasExecutions + HasMetadata,
@@ -582,7 +582,7 @@ where
         event: Event<<<Self as UsesState>::State as UsesInput>::Input>,
     ) -> Result<(), Error>
     where
-        E: Executor<Self, Z, State = <Self as UsesState>::State> + HasObservers,
+        E: Executor<Self, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
         E::Observers:
             ObserversTuple<<Self as UsesInput>::Input, <Self as UsesState>::State> + Serialize,
         <Self as UsesState>::State: UsesInput + HasExecutions + HasMetadata,
diff --git a/libafl/src/events/llmp/mgr.rs b/libafl/src/events/llmp/mgr.rs
index 5fac3c07e5..ef3d514ca5 100644
--- a/libafl/src/events/llmp/mgr.rs
+++ b/libafl/src/events/llmp/mgr.rs
@@ -410,7 +410,7 @@ where
         event: Event<S::Input>,
     ) -> Result<(), Error>
     where
-        E: Executor<Self, Z, State = S> + HasObservers,
+        E: Executor<Self, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
         E::Observers: ObserversTuple<S::Input, S> + Serialize,
         for<'a> E::Observers: Deserialize<'a>,
         Z: ExecutionProcessor<Self, <S::Corpus as Corpus>::Input, E::Observers, S>
@@ -608,7 +608,7 @@ where
     S: State + HasExecutions + HasMetadata + HasImported + HasCorpus,
     S::Corpus: Corpus<Input = S::Input>,
     SP: ShMemProvider,
-    E: HasObservers + Executor<Self, Z, State = S>,
+    E: HasObservers + Executor<Self, <S::Corpus as Corpus>::Input, S, Z>,
     E::Observers: ObserversTuple<S::Input, S> + Serialize,
     for<'a> E::Observers: Deserialize<'a>,
     Z: ExecutionProcessor<Self, <S::Corpus as Corpus>::Input, E::Observers, S>
@@ -666,7 +666,7 @@ where
 
 impl<E, EMH, S, SP, Z> EventManager<E, Z> for LlmpEventManager<EMH, S, SP>
 where
-    E: HasObservers + Executor<Self, Z, State = S>,
+    E: HasObservers + Executor<Self, <S::Corpus as Corpus>::Input, S, Z>,
     E::Observers: ObserversTuple<S::Input, S> + Serialize,
     for<'a> E::Observers: Deserialize<'a>,
     EMH: EventManagerHooksTuple<S>,
diff --git a/libafl/src/events/llmp/mod.rs b/libafl/src/events/llmp/mod.rs
index 629ff6006a..147a41ae65 100644
--- a/libafl/src/events/llmp/mod.rs
+++ b/libafl/src/events/llmp/mod.rs
@@ -294,7 +294,7 @@ where
         event: Event<DI>,
     ) -> Result<(), Error>
     where
-        E: Executor<EM, Z, State = S> + HasObservers,
+        E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
         EM: UsesState<State = S> + EventFirer,
         S::Corpus: Corpus<Input = S::Input>,
         for<'a> E::Observers: Deserialize<'a>,
@@ -349,7 +349,7 @@ where
         manager: &mut EM,
     ) -> Result<usize, Error>
     where
-        E: Executor<EM, Z, State = S> + HasObservers,
+        E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
         EM: UsesState<State = S> + EventFirer,
         S::Corpus: Corpus<Input = S::Input>,
         for<'a> E::Observers: Deserialize<'a>,
diff --git a/libafl/src/events/llmp/restarting.rs b/libafl/src/events/llmp/restarting.rs
index 361e979ac1..1a0734ebd1 100644
--- a/libafl/src/events/llmp/restarting.rs
+++ b/libafl/src/events/llmp/restarting.rs
@@ -191,7 +191,7 @@ where
 
 impl<E, EMH, S, SP, Z> EventProcessor<E, Z> for LlmpRestartingEventManager<EMH, S, SP>
 where
-    E: HasObservers + Executor<LlmpEventManager<EMH, S, SP>, Z, State = S>,
+    E: HasObservers + Executor<LlmpEventManager<EMH, S, SP>, <S::Corpus as Corpus>::Input, S, Z>,
     E::Observers: ObserversTuple<S::Input, S> + Serialize,
     for<'a> E::Observers: Deserialize<'a>,
     EMH: EventManagerHooksTuple<S>,
@@ -219,7 +219,7 @@ where
 
 impl<E, EMH, S, SP, Z> EventManager<E, Z> for LlmpRestartingEventManager<EMH, S, SP>
 where
-    E: HasObservers + Executor<LlmpEventManager<EMH, S, SP>, Z, State = S>,
+    E: HasObservers + Executor<LlmpEventManager<EMH, S, SP>, <S::Corpus as Corpus>::Input, S, Z>,
     E::Observers: ObserversTuple<S::Input, S> + Serialize,
     for<'a> E::Observers: Deserialize<'a>,
     EMH: EventManagerHooksTuple<S>,
diff --git a/libafl/src/executors/command.rs b/libafl/src/executors/command.rs
index ab19e8d98c..bb4a688dfd 100644
--- a/libafl/src/executors/command.rs
+++ b/libafl/src/executors/command.rs
@@ -745,7 +745,7 @@ impl CommandExecutorBuilder {
 /// # Example
 /// ```
 /// use std::{io::Write, process::{Stdio, Command, Child}, time::Duration};
-/// use libafl::{Error, inputs::{BytesInput, HasTargetBytes, Input, UsesInput}, executors::{Executor, command::CommandConfigurator}, state::{UsesState, HasExecutions}};
+/// use libafl::{Error, corpus::Corpus, inputs::{BytesInput, HasTargetBytes, Input, UsesInput}, executors::{Executor, command::CommandConfigurator}, state::{HasCorpus, UsesState, HasExecutions}};
 /// use libafl_bolts::AsSlice;
 /// #[derive(Debug)]
 /// struct MyExecutor;
@@ -775,10 +775,12 @@ impl CommandExecutorBuilder {
 ///     }
 /// }
 ///
-/// fn make_executor<EM, Z>() -> impl Executor<EM, Z>
+/// fn make_executor<EM, S, Z>() -> impl Executor<EM, BytesInput, S, Z>
 /// where
 ///     EM: UsesState,
 ///     EM::State: UsesInput<Input = BytesInput> + HasExecutions,
+///     S: HasCorpus + HasExecutions,
+/// 	S::Corpus: Corpus<Input = BytesInput>,
 /// {
 ///     MyExecutor.into_executor(())
 /// }
@@ -865,7 +867,7 @@ mod tests {
             Executor,
         },
         fuzzer::NopFuzzer,
-        inputs::BytesInput,
+        inputs::{BytesInput, NopInput},
         monitors::SimpleMonitor,
         state::NopState,
     };
@@ -873,9 +875,10 @@ mod tests {
     #[test]
     #[cfg_attr(miri, ignore)]
     fn test_builder() {
-        let mut mgr = SimpleEventManager::new(SimpleMonitor::new(|status| {
-            log::info!("{status}");
-        }));
+        let mut mgr: SimpleEventManager<_, NopState<NopInput>> =
+            SimpleEventManager::new(SimpleMonitor::new(|status| {
+                log::info!("{status}");
+            }));
 
         let mut executor = CommandExecutor::builder();
         executor
diff --git a/libafl/src/executors/inprocess_fork/inner.rs b/libafl/src/executors/inprocess_fork/inner.rs
index ad4b08b348..f6062c4ba0 100644
--- a/libafl/src/executors/inprocess_fork/inner.rs
+++ b/libafl/src/executors/inprocess_fork/inner.rs
@@ -20,7 +20,7 @@ use nix::{
 #[cfg(all(unix, not(target_os = "linux")))]
 use crate::executors::hooks::timer::{setitimer, Itimerval, Timeval, ITIMER_REAL};
 use crate::{
-    events::{EventFirer, EventRestarter},
+    corpus::Corpus,
     executors::{
         hooks::{
             inprocess_fork::{InChildProcessHooks, FORK_EXECUTOR_GLOBAL_DATA},
@@ -28,9 +28,8 @@ use crate::{
         },
         ExitKind, HasObservers,
     },
-    inputs::UsesInput,
     observers::ObserversTuple,
-    state::{State, UsesState},
+    state::HasCorpus,
     Error,
 };
 
@@ -73,13 +72,6 @@ where
     }
 }
 
-impl<HT, OT, S, SP, EM, Z> UsesState for GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z>
-where
-    S: State,
-{
-    type State = S;
-}
-
 #[cfg(target_os = "linux")]
 fn parse_itimerspec(timeout: Duration) -> libc::itimerspec {
     let milli_sec = timeout.as_millis();
@@ -116,18 +108,17 @@ fn parse_itimerval(timeout: Duration) -> Itimerval {
 
 impl<EM, HT, OT, S, SP, Z> GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z>
 where
-    OT: ObserversTuple<S::Input, S> + Debug,
-    S: State + UsesInput,
+    HT: ExecutorHooksTuple<<S::Corpus as Corpus>::Input, S>,
+    S: HasCorpus,
     SP: ShMemProvider,
-    HT: ExecutorHooksTuple<S>,
-    EM: EventFirer<State = S> + EventRestarter<State = S>,
+    OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
 {
     pub(super) unsafe fn pre_run_target_child(
         &mut self,
         fuzzer: &mut Z,
-        state: &mut <GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z> as UsesState>::State,
+        state: &mut S,
         mgr: &mut EM,
-        input: &<GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z> as UsesInput>::Input,
+        input: &<S::Corpus as Corpus>::Input,
     ) -> Result<(), Error> {
         self.shmem_provider.post_fork(true)?;
 
@@ -160,9 +151,9 @@ where
     pub(super) unsafe fn post_run_target_child(
         &mut self,
         fuzzer: &mut Z,
-        state: &mut <GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z> as UsesState>::State,
+        state: &mut S,
         mgr: &mut EM,
-        input: &<GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z> as UsesInput>::Input,
+        input: &<S::Corpus as Corpus>::Input,
     ) {
         self.observers
             .post_exec_child_all(state, input, &ExitKind::Ok)
@@ -209,18 +200,18 @@ where
 
 impl<HT, OT, S, SP, EM, Z> GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z>
 where
-    HT: ExecutorHooksTuple<S>,
-    S: State,
-    OT: ObserversTuple<S::Input, S>,
+    HT: ExecutorHooksTuple<<S::Corpus as Corpus>::Input, S>,
+    OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
+    S: HasCorpus,
 {
     #[inline]
     /// This function marks the boundary between the fuzzer and the target.
     pub fn enter_target(
         &mut self,
         _fuzzer: &mut Z,
-        state: &mut <Self as UsesState>::State,
+        state: &mut S,
         _event_mgr: &mut EM,
-        input: &<Self as UsesInput>::Input,
+        input: &<S::Corpus as Corpus>::Input,
     ) {
         unsafe {
             let data = &raw mut FORK_EXECUTOR_GLOBAL_DATA;
@@ -245,9 +236,9 @@ where
     pub fn leave_target(
         &mut self,
         _fuzzer: &mut Z,
-        _state: &mut <Self as UsesState>::State,
+        _state: &mut S,
         _event_mgr: &mut EM,
-        _input: &<Self as UsesInput>::Input,
+        _input: &<S::Corpus as Corpus>::Input,
     ) {
         // do nothing
     }
@@ -303,10 +294,8 @@ where
     }
 }
 
-impl<HT, OT, S, SP, EM, Z> HasObservers for GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z>
-where
-    OT: ObserversTuple<S::Input, S>,
-    S: State,
+impl<HT, OT, S, SP, EM, Z> HasObservers
+    for GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z>
 {
     type Observers = OT;
 
diff --git a/libafl/src/executors/inprocess_fork/mod.rs b/libafl/src/executors/inprocess_fork/mod.rs
index 5911adf334..56f21d1d64 100644
--- a/libafl/src/executors/inprocess_fork/mod.rs
+++ b/libafl/src/executors/inprocess_fork/mod.rs
@@ -14,16 +14,13 @@ use nix::unistd::{fork, ForkResult};
 
 use super::hooks::ExecutorHooksTuple;
 use crate::{
-    events::{EventFirer, EventRestarter},
+    corpus::Corpus,
     executors::{
         hooks::inprocess_fork::InProcessForkExecutorGlobalData,
         inprocess_fork::inner::GenericInProcessForkExecutorInner, Executor, ExitKind, HasObservers,
     },
-    feedbacks::Feedback,
-    fuzzer::HasObjective,
-    inputs::UsesInput,
     observers::ObserversTuple,
-    state::{HasExecutions, HasSolutions, State, UsesState},
+    state::{HasCorpus, HasExecutions},
     Error,
 };
 
@@ -46,16 +43,10 @@ pub mod stateful;
 pub type InProcessForkExecutor<'a, H, OT, S, SP, EM, Z> =
     GenericInProcessForkExecutor<'a, H, (), OT, S, SP, EM, Z>;
 
-impl<'a, H, OT, S, SP, EM, Z, OF> InProcessForkExecutor<'a, H, OT, S, SP, EM, Z>
+impl<'a, H, OT, S, SP, EM, Z> InProcessForkExecutor<'a, H, OT, S, SP, EM, Z>
 where
-    H: FnMut(&S::Input) -> ExitKind + ?Sized,
-    S: State,
-    OT: ObserversTuple<S::Input, S>,
-    SP: ShMemProvider,
-    EM: EventFirer<State = S> + EventRestarter<State = S>,
-    OF: Feedback<EM, S::Input, OT, S>,
-    S: HasSolutions,
-    Z: HasObjective<Objective = OF>,
+    OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
+    S: HasCorpus,
 {
     /// The constructor for `InProcessForkExecutor`
     pub fn new(
@@ -89,7 +80,12 @@ pub struct GenericInProcessForkExecutor<'a, H, HT, OT, S, SP, EM, Z> {
     inner: GenericInProcessForkExecutorInner<HT, OT, S, SP, EM, Z>,
 }
 
-impl<H, HT, OT, S, SP, EM, Z> Debug for GenericInProcessForkExecutor<'_, H, HT, OT, S, SP, EM, Z> {
+impl<H, HT, OT, S, SP, EM, Z> Debug for GenericInProcessForkExecutor<'_, H, HT, OT, S, SP, EM, Z>
+where
+    HT: Debug,
+    OT: Debug,
+    SP: Debug,
+{
     #[cfg(target_os = "linux")]
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         f.debug_struct("GenericInProcessForkExecutor")
@@ -110,20 +106,19 @@ impl<H, HT, OT, S, SP, EM, Z> Debug for GenericInProcessForkExecutor<'_, H, HT,
 impl<EM, H, HT, OT, S, SP, Z> Executor<EM, <S::Corpus as Corpus>::Input, S, Z>
     for GenericInProcessForkExecutor<'_, H, HT, OT, S, SP, EM, Z>
 where
-    H: FnMut(&S::Input) -> ExitKind + ?Sized,
-    OT: ObserversTuple<S::Input, S> + Debug,
-    S: State + HasExecutions,
+    H: FnMut(&<S::Corpus as Corpus>::Input) -> ExitKind + Sized,
+    S: HasCorpus + HasExecutions,
     SP: ShMemProvider,
-    HT: ExecutorHooksTuple<S>,
-    EM: EventFirer<State = S> + EventRestarter<State = S>,
+    HT: ExecutorHooksTuple<<S::Corpus as Corpus>::Input, S>,
+    OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
 {
     #[inline]
     fn run_target(
         &mut self,
         fuzzer: &mut Z,
-        state: &mut Self::State,
+        state: &mut S,
         mgr: &mut EM,
-        input: &Self::Input,
+        input: &<S::Corpus as Corpus>::Input,
     ) -> Result<ExitKind, Error> {
         *state.executions_mut() += 1;
 
@@ -147,16 +142,11 @@ where
     }
 }
 
-impl<'a, H, HT, OT, S, SP, EM, Z, OF> GenericInProcessForkExecutor<'a, H, HT, OT, S, SP, EM, Z>
+impl<'a, H, HT, OT, S, SP, EM, Z> GenericInProcessForkExecutor<'a, H, HT, OT, S, SP, EM, Z>
 where
-    H: FnMut(&S::Input) -> ExitKind + ?Sized,
-    HT: ExecutorHooksTuple<S>,
-    OT: ObserversTuple<S::Input, S>,
-    SP: ShMemProvider,
-    EM: EventFirer<State = S> + EventRestarter<State = S>,
-    OF: Feedback<EM, S::Input, OT, S>,
-    S: State + HasSolutions,
-    Z: HasObjective<Objective = OF>,
+    HT: ExecutorHooksTuple<<S::Corpus as Corpus>::Input, S>,
+    OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
+    S: HasCorpus,
 {
     /// Creates a new [`GenericInProcessForkExecutor`] with custom hooks
     #[expect(clippy::too_many_arguments)]
@@ -200,13 +190,6 @@ where {
 
 impl<H, HT, OT, S, SP, EM, Z> HasObservers
     for GenericInProcessForkExecutor<'_, H, HT, OT, S, SP, EM, Z>
-where
-    H: FnMut(&S::Input) -> ExitKind + ?Sized,
-    HT: ExecutorHooksTuple<S>,
-    S: State,
-    OT: ObserversTuple<S::Input, S>,
-    SP: ShMemProvider,
-    EM: UsesState<State = S>,
 {
     type Observers = OT;
     #[inline]
@@ -233,7 +216,6 @@ pub mod child_signal_handlers {
             hooks::inprocess_fork::{InProcessForkExecutorGlobalData, FORK_EXECUTOR_GLOBAL_DATA},
             ExitKind, HasObservers,
         },
-        inputs::UsesInput,
         observers::ObserversTuple,
     };
 
@@ -400,7 +382,7 @@ mod tests {
         let input = NopInput {};
         let mut fuzzer = NopFuzzer::new();
         let mut state = NopState::new();
-        let mut mgr = SimpleEventManager::printing();
+        let mut mgr: SimpleEventManager<_, NopState<NopInput>> = SimpleEventManager::printing();
         in_process_fork_executor
             .run_target(&mut fuzzer, &mut state, &mut mgr, &input)
             .unwrap();
diff --git a/libafl/src/executors/inprocess_fork/stateful.rs b/libafl/src/executors/inprocess_fork/stateful.rs
index 82757511f7..547f5497b5 100644
--- a/libafl/src/executors/inprocess_fork/stateful.rs
+++ b/libafl/src/executors/inprocess_fork/stateful.rs
@@ -15,16 +15,13 @@ use libafl_bolts::{
 use nix::unistd::{fork, ForkResult};
 
 use crate::{
-    events::{EventFirer, EventRestarter},
+    corpus::Corpus,
     executors::{
         hooks::ExecutorHooksTuple, inprocess_fork::GenericInProcessForkExecutorInner, Executor,
         ExitKind, HasObservers,
     },
-    feedbacks::Feedback,
-    fuzzer::HasObjective,
-    inputs::UsesInput,
     observers::ObserversTuple,
-    state::{HasExecutions, State, UsesState},
+    state::{HasCorpus, HasExecutions},
     Error,
 };
 
@@ -34,9 +31,8 @@ pub type StatefulInProcessForkExecutor<'a, H, OT, S, SP, ES, EM, Z> =
 
 impl<'a, H, OT, S, SP, ES, EM, Z> StatefulInProcessForkExecutor<'a, H, OT, S, SP, ES, EM, Z>
 where
-    H: FnMut(&mut ES, &S::Input) -> ExitKind + ?Sized,
-    OT: ObserversTuple<S::Input, S>,
-    S: State,
+    OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
+    S: HasCorpus,
 {
     #[expect(clippy::too_many_arguments)]
     /// The constructor for `InProcessForkExecutor`
@@ -65,11 +61,7 @@ where
 }
 
 /// [`StatefulGenericInProcessForkExecutor`] is an executor that forks the current process before each execution. Harness can access some internal state.
-pub struct StatefulGenericInProcessForkExecutor<'a, H, HT, OT, S, SP, ES, EM, Z>
-where
-    H: FnMut(&mut ES, &S::Input) -> ExitKind + ?Sized,
-    S: UsesInput,
-{
+pub struct StatefulGenericInProcessForkExecutor<'a, H, HT, OT, S, SP, ES, EM, Z> {
     /// The harness function, being executed for each fuzzing loop execution
     harness_fn: &'a mut H,
     /// The state used as argument of the harness
@@ -82,10 +74,8 @@ where
 impl<H, HT, OT, S, SP, ES, EM, Z> Debug
     for StatefulGenericInProcessForkExecutor<'_, H, HT, OT, S, SP, ES, EM, Z>
 where
-    H: FnMut(&mut ES, &S::Input) -> ExitKind + ?Sized,
     HT: Debug,
     OT: Debug,
-    S: UsesInput,
     SP: Debug,
 {
     #[cfg(target_os = "linux")]
@@ -105,34 +95,22 @@ where
     }
 }
 
-impl<H, HT, OT, S, SP, ES, EM, Z> UsesState
+impl<EM, H, HT, OT, S, SP, Z, ES> Executor<EM, <S::Corpus as Corpus>::Input, S, Z>
     for StatefulGenericInProcessForkExecutor<'_, H, HT, OT, S, SP, ES, EM, Z>
 where
-    H: FnMut(&mut ES, &S::Input) -> ExitKind + ?Sized,
-    S: State,
-{
-    type State = S;
-}
-
-impl<EM, H, HT, OT, S, SP, Z, ES, OF> Executor<EM, Z>
-    for StatefulGenericInProcessForkExecutor<'_, H, HT, OT, S, SP, ES, EM, Z>
-where
-    EM: EventFirer<State = S> + EventRestarter<State = S>,
-    H: FnMut(&mut ES, &S::Input) -> ExitKind + ?Sized,
-    HT: ExecutorHooksTuple<S>,
-    OF: Feedback<EM, S::Input, OT, S>,
-    OT: ObserversTuple<S::Input, S> + Debug,
-    S: State + HasExecutions,
+    H: FnMut(&mut ES, &<S::Corpus as Corpus>::Input) -> ExitKind + Sized,
+    HT: ExecutorHooksTuple<<<S as HasCorpus>::Corpus as Corpus>::Input, S>,
+    S: HasCorpus + HasExecutions,
     SP: ShMemProvider,
-    Z: HasObjective<Objective = OF>,
+    OT: ObserversTuple<<<S as HasCorpus>::Corpus as Corpus>::Input, S>,
 {
     #[inline]
     fn run_target(
         &mut self,
         fuzzer: &mut Z,
-        state: &mut Self::State,
+        state: &mut S,
         mgr: &mut EM,
-        input: &Self::Input,
+        input: &<S::Corpus as Corpus>::Input,
     ) -> Result<ExitKind, Error> {
         *state.executions_mut() += 1;
 
@@ -159,10 +137,9 @@ where
 impl<'a, H, HT, OT, S, SP, ES, EM, Z>
     StatefulGenericInProcessForkExecutor<'a, H, HT, OT, S, SP, ES, EM, Z>
 where
-    H: FnMut(&mut ES, &S::Input) -> ExitKind + ?Sized,
-    HT: ExecutorHooksTuple<S>,
-    OT: ObserversTuple<S::Input, S>,
-    S: State,
+    HT: ExecutorHooksTuple<<S::Corpus as Corpus>::Input, S>,
+    OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
+    S: HasCorpus,
 {
     /// Creates a new [`StatefulGenericInProcessForkExecutor`] with custom hooks
     #[expect(clippy::too_many_arguments)]
@@ -208,10 +185,6 @@ where
 
 impl<H, HT, OT, S, SP, ES, EM, Z> HasObservers
     for StatefulGenericInProcessForkExecutor<'_, H, HT, OT, S, SP, ES, EM, Z>
-where
-    H: FnMut(&mut ES, &S::Input) -> ExitKind + ?Sized,
-    OT: ObserversTuple<S::Input, S>,
-    S: State,
 {
     type Observers = OT;
 
diff --git a/libafl/src/executors/mod.rs b/libafl/src/executors/mod.rs
index 5793e11b10..4a77191b93 100644
--- a/libafl/src/executors/mod.rs
+++ b/libafl/src/executors/mod.rs
@@ -221,24 +221,14 @@ mod test {
         let nonempty_input = BytesInput::new(vec![1u8]);
         let mut executor = NopExecutor::new();
         let mut fuzzer = NopFuzzer::new();
-
-        let mut state = NopState::new();
+        let mut mgr: NopEventManager<NopState<BytesInput>> = NopEventManager::new();
+        let mut state: NopState<BytesInput> = NopState::new();
 
         executor
-            .run_target(
-                &mut fuzzer,
-                &mut state,
-                &mut NopEventManager::new(),
-                &empty_input,
-            )
+            .run_target(&mut fuzzer, &mut state, &mut mgr, &empty_input)
             .unwrap_err();
         executor
-            .run_target(
-                &mut fuzzer,
-                &mut state,
-                &mut NopEventManager::new(),
-                &nonempty_input,
-            )
+            .run_target(&mut fuzzer, &mut state, &mut mgr, &nonempty_input)
             .unwrap();
     }
 }
diff --git a/libafl/src/fuzzer/mod.rs b/libafl/src/fuzzer/mod.rs
index 1b8e41daa6..f60086d229 100644
--- a/libafl/src/fuzzer/mod.rs
+++ b/libafl/src/fuzzer/mod.rs
@@ -513,7 +513,7 @@ impl<CS, E, EM, F, IF, OF, S> EvaluatorObservers<E, EM, <S::Corpus as Corpus>::I
     for StdFuzzer<CS, F, IF, OF>
 where
     CS: Scheduler<<S::Corpus as Corpus>::Input, S>,
-    E: HasObservers + Executor<EM, Self, State = S>,
+    E: HasObservers + Executor<EM, <S::Corpus as Corpus>::Input, S, Self>,
     E::Observers: MatchName + ObserversTuple<<S::Corpus as Corpus>::Input, S> + Serialize,
     EM: EventFirer<State = S>,
     F: Feedback<EM, <S::Corpus as Corpus>::Input, E::Observers, S>,
@@ -591,7 +591,7 @@ impl<CS, E, EM, F, IF, OF, S> Evaluator<E, EM, <S::Corpus as Corpus>::Input, S>
     for StdFuzzer<CS, F, IF, OF>
 where
     CS: Scheduler<<S::Corpus as Corpus>::Input, S>,
-    E: HasObservers + Executor<EM, Self, State = S>,
+    E: HasObservers + Executor<EM, <S::Corpus as Corpus>::Input, S, Self>,
     E::Observers: MatchName + ObserversTuple<<S::Corpus as Corpus>::Input, S> + Serialize,
     EM: EventFirer<State = S>,
     F: Feedback<EM, <S::Corpus as Corpus>::Input, E::Observers, S>,
@@ -748,7 +748,6 @@ where
 impl<CS, E, EM, F, IF, OF, S, ST> Fuzzer<E, EM, S, ST> for StdFuzzer<CS, F, IF, OF>
 where
     CS: Scheduler<S::Input, S>,
-    E: UsesState<State = S>,
     EM: ProgressReporter + EventProcessor<E, Self, State = S>,
     S: HasExecutions
         + HasMetadata
@@ -923,7 +922,7 @@ impl<CS, E, EM, F, IF, OF, S> ExecutesInput<E, EM, <S::Corpus as Corpus>::Input,
     for StdFuzzer<CS, F, IF, OF>
 where
     CS: Scheduler<<S::Corpus as Corpus>::Input, S>,
-    E: Executor<EM, Self, State = S> + HasObservers,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Self> + HasObservers,
     E::Observers: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     EM: UsesState<State = S>,
     S: UsesInput<Input = <S::Corpus as Corpus>::Input>
@@ -977,7 +976,6 @@ impl Default for NopFuzzer {
 
 impl<E, EM, S, ST> Fuzzer<E, EM, S, ST> for NopFuzzer
 where
-    E: UsesState,
     EM: ProgressReporter<State = S> + EventProcessor<E, Self>,
     ST: StagesTuple<E, EM, S, Self>,
     S: HasMetadata + HasExecutions + HasLastReportTime + HasCurrentStageId + UsesInput,
diff --git a/libafl/src/stages/calibrate.rs b/libafl/src/stages/calibrate.rs
index 50c07aeb09..dea94d6551 100644
--- a/libafl/src/stages/calibrate.rs
+++ b/libafl/src/stages/calibrate.rs
@@ -88,7 +88,7 @@ const CAL_STAGE_MAX: usize = 8; // AFL++'s CAL_CYCLES + 1
 
 impl<C, E, EM, O, OT, S, Z> Stage<E, EM, S, Z> for CalibrationStage<C, E, O, OT, S>
 where
-    E: Executor<EM, Z, State = S> + HasObservers<Observers = OT>,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers<Observers = OT>,
     EM: EventFirer<State = S>,
     O: MapObserver,
     C: AsRef<O>,
diff --git a/libafl/src/stages/colorization.rs b/libafl/src/stages/colorization.rs
index 5b97301439..a47b96f827 100644
--- a/libafl/src/stages/colorization.rs
+++ b/libafl/src/stages/colorization.rs
@@ -22,7 +22,7 @@ use crate::{
     nonzero,
     observers::{MapObserver, ObserversTuple},
     stages::{RetryCountRestartHelper, Stage},
-    state::{HasCorpus, HasCurrentTestcase, HasRand, UsesState},
+    state::{HasCorpus, HasCurrentTestcase, HasRand},
     Error, HasMetadata, HasNamedMetadata,
 };
 
@@ -68,10 +68,7 @@ pub struct ColorizationStage<C, E, EM, O, S, Z> {
     phantom: PhantomData<(E, EM, O, E, S, Z)>,
 }
 
-impl<C, E, EM, O, S, Z> Named for ColorizationStage<C, E, EM, O, S, Z>
-where
-    E: UsesState,
-{
+impl<C, E, EM, O, S, Z> Named for ColorizationStage<C, E, EM, O, S, Z> {
     fn name(&self) -> &Cow<'static, str> {
         &self.name
     }
@@ -80,7 +77,7 @@ where
 impl<C, E, EM, O, S, Z> Stage<E, EM, S, Z> for ColorizationStage<C, E, EM, O, S, Z>
 where
     EM: EventFirer<State = S>,
-    E: HasObservers + Executor<EM, Z, State = S>,
+    E: HasObservers + Executor<EM, <S::Corpus as Corpus>::Input, S, Z>,
     S: HasCorpus
         + HasMetadata
         + HasRand
@@ -162,7 +159,7 @@ where
     EM: EventFirer<State = S>,
     O: MapObserver,
     C: AsRef<O> + Named,
-    E: HasObservers + Executor<EM, Z, State = S>,
+    E: HasObservers + Executor<EM, <S::Corpus as Corpus>::Input, S, Z>,
     E::Observers: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     S: HasCorpus
         + HasMetadata
diff --git a/libafl/src/stages/concolic.rs b/libafl/src/stages/concolic.rs
index be5765f3c6..904bc524be 100644
--- a/libafl/src/stages/concolic.rs
+++ b/libafl/src/stages/concolic.rs
@@ -50,7 +50,7 @@ impl<EM, TE, S, Z> Named for ConcolicTracingStage<'_, EM, TE, S, Z> {
 
 impl<E, EM, TE, S, Z> Stage<E, EM, S, Z> for ConcolicTracingStage<'_, EM, TE, S, Z>
 where
-    TE: Executor<EM, Z, State = S> + HasObservers,
+    TE: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
     TE::Observers: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     S: HasExecutions
         + HasCorpus
diff --git a/libafl/src/stages/generalization.rs b/libafl/src/stages/generalization.rs
index 00e1fbacf3..496a1bb49e 100644
--- a/libafl/src/stages/generalization.rs
+++ b/libafl/src/stages/generalization.rs
@@ -64,7 +64,7 @@ impl<C, E, EM, O, S, Z> Stage<E, EM, S, Z> for GeneralizationStage<C, EM, O, E::
 where
     O: MapObserver,
     C: CanTrack + AsRef<O> + Named,
-    E: Executor<EM, Z, State = S> + HasObservers,
+    E: Executor<EM, BytesInput, S, Z> + HasObservers,
     E::Observers: ObserversTuple<BytesInput, S>,
     S: HasExecutions
         + HasMetadata
@@ -348,6 +348,7 @@ where
         + HasCorpus
         + MaybeHasClientPerfMonitor
         + UsesInput<Input = BytesInput>,
+    S::Corpus: Corpus<Input = BytesInput>,
     OT: ObserversTuple<BytesInput, S>,
     EM: UsesState<State = S>,
 {
@@ -375,7 +376,7 @@ where
         input: &BytesInput,
     ) -> Result<bool, Error>
     where
-        E: Executor<EM, Z, State = S> + HasObservers,
+        E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
         E::Observers: ObserversTuple<BytesInput, S>,
     {
         start_timer!(state);
@@ -417,7 +418,7 @@ where
         split_char: u8,
     ) -> Result<(), Error>
     where
-        E: Executor<EM, Z, State = S> + HasObservers<Observers = OT>,
+        E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers<Observers = OT>,
     {
         let mut start = 0;
         while start < payload.len() {
@@ -455,7 +456,7 @@ where
         closing_char: u8,
     ) -> Result<(), Error>
     where
-        E: Executor<EM, Z, State = S> + HasObservers<Observers = OT>,
+        E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers<Observers = OT>,
     {
         let mut index = 0;
         while index < payload.len() {
diff --git a/libafl/src/stages/power.rs b/libafl/src/stages/power.rs
index 695d2c6038..ba81b38b5e 100644
--- a/libafl/src/stages/power.rs
+++ b/libafl/src/stages/power.rs
@@ -79,7 +79,7 @@ where
 
 impl<E, F, EM, I, M, S, Z> Stage<E, EM, S, Z> for PowerMutationalStage<E, F, EM, I, M, S, Z>
 where
-    E: Executor<EM, Z, State = S> + HasObservers,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
     EM: UsesState<State = S>,
     F: TestcaseScore<S>,
     M: Mutator<I, S>,
@@ -121,7 +121,7 @@ where
 
 impl<E, F, EM, I, M, S, Z> PowerMutationalStage<E, F, EM, I, M, S, Z>
 where
-    E: Executor<EM, Z, State = S> + HasObservers,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
     EM: UsesState<State = S>,
     F: TestcaseScore<S>,
     I: Input,
diff --git a/libafl/src/stages/push/mod.rs b/libafl/src/stages/push/mod.rs
index eba9d9797e..76a2389d94 100644
--- a/libafl/src/stages/push/mod.rs
+++ b/libafl/src/stages/push/mod.rs
@@ -256,7 +256,7 @@ where
         + HasNamedMetadata
         + HasMetadata
         + UsesInput<Input = <S::Corpus as Corpus>::Input>,
-    E: Executor<EM, Z, State = S> + HasObservers<Observers = OT>,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers<Observers = OT>,
     EM: EventFirer<State = S> + EventRestarter + HasEventManagerId + ProgressReporter<State = S>,
     OT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     PS: PushStage<EM, <S::Corpus as Corpus>::Input, OT, S, Z>,
diff --git a/libafl/src/stages/sync.rs b/libafl/src/stages/sync.rs
index 5d8ecd6c5b..57aee77461 100644
--- a/libafl/src/stages/sync.rs
+++ b/libafl/src/stages/sync.rs
@@ -243,7 +243,7 @@ where
         + UsesInput<Input = <S::Corpus as Corpus>::Input>
         + State,
     SP: ShMemProvider,
-    E: HasObservers + Executor<EM, Z, State = S>,
+    E: HasObservers + Executor<EM, <S::Corpus as Corpus>::Input, S, Z>,
     for<'a> E::Observers: Deserialize<'a>,
     Z: EvaluatorObservers<E, EM, <S::Corpus as Corpus>::Input, S>
         + ExecutionProcessor<EM, <S::Corpus as Corpus>::Input, E::Observers, S>,
diff --git a/libafl/src/stages/tracing.rs b/libafl/src/stages/tracing.rs
index 3ca29cefbc..13dfdec1c0 100644
--- a/libafl/src/stages/tracing.rs
+++ b/libafl/src/stages/tracing.rs
@@ -32,7 +32,7 @@ pub struct TracingStage<EM, TE, S, Z> {
 
 impl<EM, TE, S, Z> TracingStage<EM, TE, S, Z>
 where
-    TE: Executor<EM, Z, State = S> + HasObservers,
+    TE: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
     TE::Observers: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     S: HasExecutions
         + HasCorpus
@@ -76,7 +76,7 @@ where
 
 impl<E, EM, TE, S, Z> Stage<E, EM, S, Z> for TracingStage<EM, TE, S, Z>
 where
-    TE: Executor<EM, Z, State = S> + HasObservers,
+    TE: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
     TE::Observers: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     S: HasExecutions
         + HasCorpus
@@ -164,10 +164,10 @@ impl<E, EM, SOT, S, Z> Named for ShadowTracingStage<E, EM, SOT, S, Z> {
     }
 }
 
-impl<E, EM, SOT, S, Z> Stage<ShadowExecutor<E, SOT>, EM, S, Z>
+impl<E, EM, SOT, S, Z> Stage<ShadowExecutor<E, S, SOT>, EM, S, Z>
     for ShadowTracingStage<E, EM, SOT, S, Z>
 where
-    E: Executor<EM, Z, State = S> + HasObservers,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
     E::Observers: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     SOT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     S: HasExecutions
@@ -184,7 +184,7 @@ where
     fn perform(
         &mut self,
         fuzzer: &mut Z,
-        executor: &mut ShadowExecutor<E, SOT>,
+        executor: &mut ShadowExecutor<E, S, SOT>,
         state: &mut S,
         manager: &mut EM,
     ) -> Result<(), Error> {
@@ -227,13 +227,13 @@ where
 
 impl<E, EM, SOT, S, Z> ShadowTracingStage<E, EM, SOT, S, Z>
 where
-    E: Executor<EM, Z, State = S> + HasObservers,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers,
     S: HasExecutions + HasCorpus + UsesInput,
     SOT: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
     EM: UsesState<State = S>,
 {
     /// Creates a new default stage
-    pub fn new(_executor: &mut ShadowExecutor<E, SOT>) -> Self {
+    pub fn new(_executor: &mut ShadowExecutor<E, S, SOT>) -> Self {
         // unsafe but impossible that you create two threads both instantiating this instance
         let stage_id = unsafe {
             let ret = SHADOW_TRACING_STAGE_ID;
diff --git a/libafl/src/stages/verify_timeouts.rs b/libafl/src/stages/verify_timeouts.rs
index 74e3e88c16..560f014340 100644
--- a/libafl/src/stages/verify_timeouts.rs
+++ b/libafl/src/stages/verify_timeouts.rs
@@ -84,7 +84,7 @@ impl<I> TimeoutsToVerify<I> {
 impl<E, EM, S, Z> Stage<E, EM, S, Z> for VerifyTimeoutsStage<E, S>
 where
     E::Observers: ObserversTuple<<S::Corpus as Corpus>::Input, S>,
-    E: Executor<EM, Z, State = S> + HasObservers + HasTimeout,
+    E: Executor<EM, <S::Corpus as Corpus>::Input, S, Z> + HasObservers + HasTimeout,
     EM: UsesState<State = S>,
     Z: Evaluator<E, EM, <S::Corpus as Corpus>::Input, S>,
     S: HasCorpus + HasMetadata + UsesInput<Input = <S::Corpus as Corpus>::Input>,
diff --git a/libafl_targets/src/cmps/stages/aflpptracing.rs b/libafl_targets/src/cmps/stages/aflpptracing.rs
index 7d20d04e3f..308978c0f4 100644
--- a/libafl_targets/src/cmps/stages/aflpptracing.rs
+++ b/libafl_targets/src/cmps/stages/aflpptracing.rs
@@ -37,7 +37,7 @@ impl<EM, TE, S, Z> Named for AFLppCmplogTracingStage<'_, EM, TE, S, Z> {
 impl<E, EM, TE, S, Z> Stage<E, EM, S, Z> for AFLppCmplogTracingStage<'_, EM, TE, S, Z>
 where
     EM: UsesState<State = S>,
-    TE: HasObservers + Executor<EM, Z, State = S>,
+    TE: HasObservers + Executor<EM, BytesInput, S, Z>,
     TE::Observers: MatchNameRef + ObserversTuple<BytesInput, S>,
     S: HasCorpus
         + HasCurrentTestcase