Fixed client along with API change.
Fixed client, model along with API changes.