Added OnDeathFactory/RemoveElementFactory