Added support for booleans