#356: Add group option