Added death support to the server and client