Add fault tolerance