Added handling for conditionals in Parser class