Added decoding for headers