Adding ClientManager