Now with more header parsing