Adds support for custom headers