Moving mediator to envoi