Change objectMap to include the functor in the tag instead as a function argument