Rename count_distinct to n_distinct
Remove _value
Vingette improvements from Garrett