Updating map to use the Functor API.