Update for new headers api