Added Functor and FunctorProxy.