Add Timeout to waiter