Refactor to remove need for TopicTableDelegate