Add headers to callback & tag v3.1.1