updated mediator support