Improve boolization