Add support for bool and null