Enhanced MessageService.