Update comments for messaging