Adding support for response headers