Added Server and Client communication