Major change to allow for functor aggregate