Added comparison and logic expressions