Re: add map back to Functor