Adding conditional parsing