Added support to collapse data in both new dimensions