Added a client manager