Improved ProjectWatcherBase