Updated TopicMap