Minor changes ... DataTree and Watchmanager still not final checked