Made changes to Server and Client classes