Adjust client to agent - line up with docs