ClientManager updates