Reverted back from Mode.Group to ModeGroup