Updated picker to use watcher API