Enhance headers.