Added new functionality to watershed + networking facilities