Added support for bool