Adding unwind headers