Added support for headers.