Added more parser logic.