Add lazy parsing of headers