Added restartability