Add checkbox/radio support