Reorganised & improved header management