Began adding support for innerGroupBy