Adds support for Checkbox/Radio inputs on #433