[JFG][Fault-Tolerance] refactoring