Add some support for adding headers