Add support for bools, better type handling