ADD support for headers block