added boolean support