Mediator turned to Singleton