add yes_or_no support