Header changes for Foundation