Added waiter class