Support for custom headers