Added header modification capability