WSOTWO-138: Adopted general mediator style