Changes to TopicAnalyzer