Changes for new header api