Update headers as well