Close #17: Ad type to MessageHeader