Added Client close and Client restart