Added some code to parser.py for better sync with analyze.py
Added some code to parser.py for better sync with analyze.py