Track msg_type also.