Add separate delegate and cancellation headers