Adding support for adding additional headers, if needed