added support for yes/no values on tokens