Support for custom group_by columns