Added support for custom headers