Add options to enable extra headers