New Functor classes and minor changes