Added support for boolean