Add extra headers in the right place