Add checks for all message types