Improve headers