Updated default mediator