Enhance extra headers management