Before adding message bus