Added ClientManager code