diff --git a/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts b/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts
index 18845a7..9e07c17 100644
--- a/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts
+++ b/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts
@@ -93,7 +93,7 @@ export abstract class BaseHttpDataSourceOptionsBuilder<TQuery extends IQueryCrit
     return this._messageErrorHandler(err);
   }
 
-  public addCommandByCallback<TCommand, TCommandResult>(name: string, commandHandler: (command: TCommand) => Observable<TCommandResult>, resolveCommandModel?: (event: IResolveCommandModelEvent<TModel>) => Observable<TCommand & any>) {
+  public addCommandByCallback<TCommand, TCommandResult>(name: string, commandHandler: (command: TCommand) => Observable<TCommandResult>, resolveCommandModel?: (event: IResolveCommandModelEvent<TModel>) => Observable<Partial<TCommand>>) {
     const handleWrapper = (command: TCommand) => {
       return commandHandler(command).pipe(catchError(this._handleErrorPipe.bind(this)));
     };
@@ -108,7 +108,7 @@ export abstract class BaseHttpDataSourceOptionsBuilder<TQuery extends IQueryCrit
     return this;
   }
 
-  public addCommandByUrl<TCommand, TCommandResult>(name: string, url: string, resolveCommandModel?: (event: IResolveCommandModelEvent<TModel>) => Observable<TCommand & any>, beforeCommand?: (command: TCommand) => Observable<TCommand>) {
+  public addCommandByUrl<TCommand, TCommandResult>(name: string, url: string, resolveCommandModel?: (event: IResolveCommandModelEvent<TModel>) => Observable<Partial<TCommand>>, beforeCommand?: (command: TCommand) => Observable<TCommand>) {
     const handleWrapper = (command: TCommand) => {
       const finalBeforeCommand = beforeCommand || (_ => of(command));
       return finalBeforeCommand(command)