Support columns_for_distinct