Added initial header parsing