Project Default Watchers refactored