Add manage of headers