Refactored wait bot for class call conditions