Kindly migrate client code

2 out of 2