Improving Water Supply and Water Resources Oversight