Cleaning up the client accessor methods to support passing in auth token