Improved header usage.