Put death handling method in a separate module, it will nedd more work