Added support for AND, OR and whitespace