Add ParserManager.retainToken
Minor changes