Added radio validation support