Support more header types