Change notificator to use message