Refactored topic management