Updated api client