Add Waiter.h in base