Added waiting class