Added more support for booleans