Use Uniques instead of Paths in WatchMap