Improve client