Manage clients rework