Add support for headers