Begin adding retry join interval and  timeout