Updated coffee grouping