Added message type guards