Update to new ConnectionManager from ApiClient