Added mediator and facade