Adding basic support for guessing headers