add folder_watcher synchronization support