Improve client sample.