Kindly migrate client code