Added condition to parser