More SQL message bus refactoring