Adding support for header parameters