added support for booleans and null