Add a bunch of stuff for client and requests