add more parser logic