[TASK] Replace the OperationResolver