Refactored MessageBus to RAII