Updates to server and client to handle header.