Added support for header parameters