Added boolean support