Added boolean supp support