Header responsibility improved