Add checks for the new messages