Added ClientManager