Added Query, Topic and TopicCategory