Updated messageService