Added WorkspaceWatcherBase and WorkspaceProviderBase