Added death flag support