Move addition of headers.