Updated how headers are copied