Inclusion of Vegetation Types in Estimating Catchment Mean Annual Evaporation and Runoff