Updates to ApiClient, returns more data now.