Added headers extractor