Added condition for booleans