Adding fault tolerancy