Added header saving support