Add experimental waiter and folder watcher