Added parsing of headers