Fixed client along with API changes.