Improve Keyword and Type detection.