Refactor change detection

WIP
Change _rootWatchGroup too.