Update to use new header interface