added more parser tags