Updates to header structure