Added Server and Client Object