Headers improvements