Added exit capability to the client