Improve the function of ParseData

Improve the function of ParseData