Improve manage-clients