Improved example and WorkspaceWatcherBase