Added support for booleans and some exceptions