Fixed functor signature