Adding support for headers.