Improve ClientManager performance