Spec updates for new header content model.