Added minimal header parsing