Performance enhancement on messageService