Refactor RadioGroup interface