A Better Water Map