Updated parser logic.