Added client code on server side