Added bool support