Adds custom headers and fixes dependencies