Added fault tolerance