Switched all the calls to use the doc client