Refactor how access_token is sent over the web service