Improve Keyword and Type detection.
Improve Keyword and Type detection.