Added client side for updated API