Improved Mediator API and added ConditionalMediator.