Added functor processing to Mock