moving api version2 stuff to private api client