Added AND and OR logic to parser