Add split and groupRows