Improved usage of headers.