Added the waiter server