Added evaluation of logical expressions