diff --git a/src/lib/application/eventsourcing-aggregate.ts b/src/lib/application/eventsourcing-aggregate.ts
index c1fa5ba..0456d07 100644
--- a/src/lib/application/eventsourcing-aggregate.ts
+++ b/src/lib/application/eventsourcing-aggregate.ts
@@ -31,11 +31,11 @@ export interface IEventRepository<C, E, V, CM, EM> {
   /**
    * Fetch events
    *
-   * @param command - Command of type `C`
+   * @param command - Command of type `C` with metadata of type `CM`
    *
    * @return list of Events with Version and Event Metadata
    */
-  readonly fetch: (command: C) => Promise<readonly (E & V & EM)[]>;
+  readonly fetch: (command: C & CM) => Promise<readonly (E & V & EM)[]>;
 
   /**
    * Get the latest event stream version / sequence
@@ -138,7 +138,7 @@ export abstract class EventComputation<C, S, E> implements IDecider<C, S, E> {
  * An abstract algorithm to compute new events based on the old events and the command being handled.
  * It returns all the events, including the events created by handling commands which are triggered by Saga - orchestration included.
  */
-export abstract class EventOrchestratingComputation<C, S, E>
+export abstract class EventOrchestratingComputation<C, S, E, CM>
   implements IDecider<C, S, E>, ISaga<E, C>
 {
   protected constructor(
@@ -175,8 +175,8 @@ export abstract class EventOrchestratingComputation<C, S, E>
 
   protected async computeNewEvents(
     events: readonly E[],
-    command: C,
-    fetch: (c: C) => Promise<readonly E[]>
+    command: C & CM,
+    fetch: (c: C & CM) => Promise<readonly E[]>
   ): Promise<readonly E[]> {
     // eslint-disable-next-line functional/no-let
     let resultingEvents = this.computeNewEventsInternally(events, command);
@@ -222,7 +222,7 @@ export class EventSourcingAggregate<C, S, E, V, CM, EM>
     super(decider);
   }
 
-  async fetch(command: C): Promise<readonly (E & V & EM)[]> {
+  async fetch(command: C & CM): Promise<readonly (E & V & EM)[]> {
     return this.eventRepository.fetch(command);
   }
 
@@ -268,7 +268,7 @@ export class EventSourcingAggregate<C, S, E, V, CM, EM>
  * @author Иван Дугалић / Ivan Dugalic / @idugalic
  */
 export class EventSourcingOrchestratingAggregate<C, S, E, V, CM, EM>
-  extends EventOrchestratingComputation<C, S, E>
+  extends EventOrchestratingComputation<C, S, E, CM>
   implements IEventSourcingOrchestratingAggregate<C, S, E, V, CM, EM>
 {
   constructor(
@@ -279,7 +279,7 @@ export class EventSourcingOrchestratingAggregate<C, S, E, V, CM, EM>
     super(decider, saga);
   }
 
-  async fetch(command: C): Promise<readonly (E & V & EM)[]> {
+  async fetch(command: C & CM): Promise<readonly (E & V & EM)[]> {
     return this.eventRepository.fetch(command);
   }
 
@@ -301,7 +301,7 @@ export class EventSourcingOrchestratingAggregate<C, S, E, V, CM, EM>
         await this.computeNewEvents(
           currentEvents,
           command,
-          async (cmd: C) => await this.eventRepository.fetch(cmd)
+          async (cmd: C & CM) => await this.eventRepository.fetch(cmd)
         )
       ).map((event) => ({
         ...event,
diff --git a/src/lib/application/materialized-view.ts b/src/lib/application/materialized-view.ts
index 6ff921e..d7b51bc 100644
--- a/src/lib/application/materialized-view.ts
+++ b/src/lib/application/materialized-view.ts
@@ -33,7 +33,7 @@ export interface IViewStateRepository<E, S, V, EM> {
    *
    * @return current state / `S` with version / `V`, or NULL
    */
-  readonly fetch: (event: E) => Promise<(S & V) | null>;
+  readonly fetch: (event: E & EM) => Promise<(S & V) | null>;
   /**
    * Save state
    *
@@ -93,7 +93,7 @@ export class MaterializedView<S, E, V, EM>
     return this.view.evolve(state, event);
   }
 
-  async fetch(event: E): Promise<(S & V) | null> {
+  async fetch(event: E & EM): Promise<(S & V) | null> {
     return this.viewStateRepository.fetch(event);
   }
 
diff --git a/src/lib/application/statestored-aggregate.ts b/src/lib/application/statestored-aggregate.ts
index f98c6d3..3f320f9 100644
--- a/src/lib/application/statestored-aggregate.ts
+++ b/src/lib/application/statestored-aggregate.ts
@@ -31,10 +31,10 @@ export interface IStateRepository<C, S, V, CM, SM> {
   /**
    * Fetch state, version and metadata
    *
-   * @param command - Command payload
+   * @param command - Command payload of type C with metadata of type `CM`
    * @return current State/[S], Version/[V] and State Metadata/[SM]
    */
-  readonly fetch: (command: C) => Promise<(S & V & SM) | null>;
+  readonly fetch: (command: C & CM) => Promise<(S & V & SM) | null>;
 
   /**
    * Save state (with optimistic locking)
@@ -171,7 +171,7 @@ export class StateStoredAggregate<C, S, E, V, CM, SM>
   ) {
     super(decider);
   }
-  async fetch(command: C): Promise<(S & V & SM) | null> {
+  async fetch(command: C & CM): Promise<(S & V & SM) | null> {
     return this.stateRepository.fetch(command);
   }
 
@@ -180,7 +180,7 @@ export class StateStoredAggregate<C, S, E, V, CM, SM>
   }
 
   async handle(command: C & CM): Promise<S & V & SM> {
-    const currentState = await this.stateRepository.fetch(command as C);
+    const currentState = await this.stateRepository.fetch(command);
     const newState = this.computeNewState(
       currentState ? currentState : this.decider.initialState,
       command
@@ -220,7 +220,7 @@ export class StateStoredOrchestratingAggregate<C, S, E, V, CM, SM>
     super(decider, saga);
   }
 
-  async fetch(command: C): Promise<(S & V & SM) | null> {
+  async fetch(command: C & CM): Promise<(S & V & SM) | null> {
     return this.stateRepository.fetch(command);
   }
 
@@ -229,7 +229,7 @@ export class StateStoredOrchestratingAggregate<C, S, E, V, CM, SM>
   }
 
   async handle(command: C & CM): Promise<S & V & SM> {
-    const currentState = await this.stateRepository.fetch(command as C);
+    const currentState = await this.stateRepository.fetch(command);
     const newState = this.computeNewState(
       currentState ? currentState : this.decider.initialState,
       command