Improve client specs