Add extra check on topic_type. Comment remaining methods