Upgrading the Functionality of Water Facilities to Address Water Scarcity