Added rudimentary fault tolerance support