Added boolean functionality