Added untested aggregate and groupJoin