Added rules to handle `and`, `or`, `not` cases