Add explicit ids for headers