Add radio types
Try qiuck commit
Minor fix