YH-56: Support for default group