Add infinite group option