Refactored topic creation