Adding preliminary support for truncated headers