Add a keyword parser.
Add more metrics in test.