Start adding support for radio and checkbox