Some changes ... still need changes to WatchManager and DataTree