Improve the parser
Signed-off-by: shunen.chen <shunen.chen@gmail.com>