Add support for yes and no