Bringing Water Policies Into the 21st Century