Fix Waiter class definition