Added host option to support grouping