Added Tokenizer to Waiter