Updated MessageService.