Few changes in Mediator