Added respawn handling