Move logical and comparison into operators and add  into operators