add header support in more varieties