Add more support for adding headers