Fault tolerance added