Client imports cleanup
Enable sample command to support multiple grouping fields