Add and improve headers