Improve .hdr file parsing