Added support for new header