added mediator and commandrouter