Add initial fault tolerance